Skip to content

Commit

Permalink
fix for boost includes
Browse files Browse the repository at this point in the history 
added 3rdparty/boost for msvc and gcc
  • Loading branch information
@niklwors
niklwors committed Apr 13, 2016
1 parent 9255662 commit 08d59fb
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 48 deletions.
144 changes: 97 additions & 47 deletions Makefile.omdev.mingw
View file
Expand Up @@ -213,52 +213,102 @@ endif

copycppheader:
echo Copying needed header files to the $(OMBUILDDIR)/include/omc/cpp directory
(mkdir -p $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -puf $(BOOST_PATH)/boost/*.hpp $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/algorithm $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/archive $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/assign $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/atomic $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/bind $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/circular_buffer $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/chrono $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/concept $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/config $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/container $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/detail $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/exception $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/date_time $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/filesystem $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/format $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/function $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/functional $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/integer $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/intrusive $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/io $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/iterator $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/math $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/move $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/mpl $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/multi_array $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/numeric $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/optional $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/predef $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/preprocessor $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/program_options $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/ptr_container $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/range $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/serialization $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/smart_ptr $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/system $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/ratio $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/thread $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/tuple $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/type_traits $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/typeof $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/unordered $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/utility $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/property_tree $(OMBUILDDIR)/include/omc/cpp/boost)
(cp -pufr $(BOOST_PATH)/boost/multi_index $(OMBUILDDIR)/include/omc/cpp/boost)
(mkdir -p $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -puf $(BOOST_PATH)/boost/*.hpp $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/algorithm $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/archive $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/assign $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/atomic $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/bind $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/circular_buffer $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/chrono $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/concept $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/config $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/container $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/detail $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/exception $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/date_time $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/filesystem $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/format $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/function $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/functional $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/integer $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/intrusive $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/io $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/iterator $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/math $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/move $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/mpl $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/multi_array $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/numeric $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/optional $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/predef $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/preprocessor $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/program_options $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/ptr_container $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/range $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/serialization $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/smart_ptr $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/system $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/ratio $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/thread $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/tuple $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/type_traits $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/typeof $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/unordered $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/utility $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/property_tree $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)
(cp -pufr $(BOOST_PATH)/boost/multi_index $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/gcc/boost)

copycppmsvcheader:
echo Copying needed header files to the $(OMBUILDDIR)/include/omc/cpp/ directory
(mkdir -p $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -puf $(BOOST_PATH_MSVC)/boost/*.hpp $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/algorithm $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/archive $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/assign $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/atomic $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/bind $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/circular_buffer $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/chrono $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/concept $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/config $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/container $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/detail $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/exception $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/date_time $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/filesystem $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/format $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/function $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/functional $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/integer $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/intrusive $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/io $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/iterator $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/math $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/move $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/mpl $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/multi_array $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/numeric $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/optional $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/predef $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/preprocessor $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/program_options $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/ptr_container $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/range $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/serialization $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/smart_ptr $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/system $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/ratio $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/thread $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/tuple $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/type_traits $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/typeof $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/unordered $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/utility $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/property_tree $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)
(cp -pufr $(BOOST_PATH_MSVC)/boost/multi_index $(OMBUILDDIR)/include/omc/cpp/3rdParty/boost/msvc/boost)


omc: mkbuilddirs interactive fmil omdev_extra_dlls breakprocess opencl_rt CMinpack metis Cdaskr $(IPOPT_TARGET) graphstream
(time $(MAKE) -f $(defaultMakefileTarget) CFLAGS="$(CFLAGS)" omc-bootstrapped OMBUILDDIR=$(OMBUILDDIR))
Expand Down Expand Up @@ -395,7 +445,7 @@ sundials_msvc: getMSVCversion 3rdParty/sundials/CMakeLists.txt
(cp -puf 3rdParty/sundials/build_msvc/lib/* $(OMBUILDDIR)/lib/omc/msvc/)
(cp -puf 3rdParty/sundials/build_msvc/lib/*.dll $(OMBUILDDIR)/bin)

runtimeCPPmsvcinstall: mkbuilddirs CMinpack_msvc sundials_msvc copycppheader
runtimeCPPmsvcinstall: mkbuilddirs CMinpack_msvc sundials_msvc copycppmsvcheader
$(MAKE) -C SimulationRuntime/cpp/ -f Makefile.omdev.mingw runtimeCPPmsvc OMBUILDDIR=$(OMBUILDDIR)
cp -p $(BOOST_PATH_MSVC)/lib/*vc*.dll $(OMBUILDDIR)/bin/
cp -p $(BOOST_PATH_MSVC)/lib/*vc*.lib $(OMBUILDDIR)/lib/omc/cpp/msvc
Expand Down
7 changes: 6 additions & 1 deletion SimulationRuntime/cpp/Core/Modelica/CMakeLists.txt
View file
Expand Up @@ -113,7 +113,12 @@ ENDIF(CMAKE_BUILD_TYPE)

IF(WIN32)
SET(Boost_LIBS_ "$(OMHOME)/bin")
SET(Boost_INCLUDE_ "$(OMHOME)/include/omc/cpp")
IF(MSVC)
SET(Boost_INCLUDE_ "$(OMHOME)/include/omc/cpp/3rdParty/boost/msvc/")
ELSE(MSVC)
SET(Boost_INCLUDE_ "$(OMHOME)/include/omc/cpp/3rdParty/boost/gcc/")
ENDIF(MSVC)

SET(SUNDIALS_LIBS_ "$(OMHOME)/bin")
SET(SUNDIALS_INCLUDE_DIR_ "$(OMHOME)/include/omc/cpp/sundials")
SET(LAPACK_LIBS_ "$(OMHOME)/bin")
Expand Down

0 comments on commit 08d59fb

Please sign in to comment.