Skip to content

Commit

Permalink
- enabled JOM for build of C++ simulation runtime
Browse files Browse the repository at this point in the history 
- changed folder-name build_msvc to Build_MSVC, to be consistent to GCC build
- boost-property tree header are now copied to output folder as well
  • Loading branch information
Marcus Walther committed Sep 14, 2015
1 parent 442b07a commit e19799f
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 27 deletions.
4 changes: 3 additions & 1 deletion Makefile.omdev.mingw
View file
Expand Up @@ -177,13 +177,15 @@ copycppheader:
(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/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)

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
52 changes: 26 additions & 26 deletions SimulationRuntime/cpp/Makefile.omdev.mingw
View file
Expand Up @@ -26,47 +26,47 @@ runtimeCpp:
runtimeCPPmsvc:
test -f """${VS100COMNTOOLS}/../../VC/vcvarsall.bat"""
echo 'Build the cppRuntime with MSVC'
#rm -rf build_msvc
mkdir -p build_msvc
echo call '"%VS100COMNTOOLS%\\..\\..\\VC\\vcvarsall.bat"' > build_msvc/build.bat
#echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DCMAKE_INSTALL_PREFIX=./tmp ../ -G "Visual Studio 10"' >> build_msvc/build.bat
#rm -rf Build_MSVC
mkdir -p Build_MSVC
echo call '"%VS100COMNTOOLS%\\..\\..\\VC\\vcvarsall.bat"' > Build_MSVC/build.bat
#echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DCMAKE_INSTALL_PREFIX=./tmp ../ -G "Visual Studio 10"' >> Build_MSVC/build.bat
ifeq ($(BUILDTYPE),Debug)
echo echo Running CMake from '%OMDEV%\\bin\\cmake\\bin\\cmake' >> build_msvc/build.bat
echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DCMAKE_INSTALL_PREFIX=./tmp ../ -G "NMake Makefiles"' >> build_msvc/build.bat
echo echo Running CMake from '%OMDEV%\\bin\\cmake\\bin\\cmake' >> Build_MSVC/build.bat
echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DCMAKE_INSTALL_PREFIX=./tmp ../ -G "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> Build_MSVC/build.bat
else
echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DCMAKE_INSTALL_PREFIX=./tmp ../ -G "NMake Makefiles"' >> build_msvc/build.bat
echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DCMAKE_INSTALL_PREFIX=./tmp ../ -G "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> Build_MSVC/build.bat
endif
# for some reason, the environment variable 'MAKEFLAGS' was set to 'w' on my and Niklas' machine?!
echo set MAKEFLAGS="" >> build_msvc/build.bat
echo echo Running NMake >> build_msvc/build.bat
echo nmake /f Makefile install >> build_msvc/build.bat
cd ./build_msvc; echo "change to build_msvc";\
echo set MAKEFLAGS="" >> Build_MSVC/build.bat
echo echo Running NMake JOM >> Build_MSVC/build.bat
echo %OMDEV%\\tools\\jom\\jom.exe /f Makefile install >> Build_MSVC/build.bat
cd ./Build_MSVC; echo "change to Build_MSVC";\
cmd /c build.bat

# move msvc libs into subfolder
mkdir -p build_msvc/tmp/lib/omc/cpp/msvc
mv build_msvc/tmp/lib/omc/cpp/*.dll build_msvc/tmp/lib/omc/cpp/msvc
mv build_msvc/tmp/lib/omc/cpp/*.lib build_msvc/tmp/lib/omc/cpp/msvc
mkdir -p Build_MSVC/tmp/lib/omc/cpp/msvc
mv Build_MSVC/tmp/lib/omc/cpp/*.dll Build_MSVC/tmp/lib/omc/cpp/msvc
mv Build_MSVC/tmp/lib/omc/cpp/*.lib Build_MSVC/tmp/lib/omc/cpp/msvc


# copy pdb files
ifneq ($(BUILDTYPE),Release)
cp -u build_msvc/Solver/Newton/*.pdb build_msvc/tmp/lib/omc/cpp/msvc
cp -u build_msvc/Solver/Euler/*.pdb build_msvc/tmp/lib/omc/cpp/msvc
cp -u build_msvc/Core/SimController/*.pdb build_msvc/tmp/lib/omc/cpp/msvc
cp -u build_msvc/Core/Modelica/*.pdb build_msvc/tmp/lib/omc/cpp/msvc
#cp -u build_msvc/Core/ModelicaExternalC/*.pdb build_msvc/tmp/lib/omc/cpp/msvc
cp -u build_msvc/Core/SimulationSettings/*.pdb build_msvc/tmp/lib/omc/cpp/msvc
cp -u build_msvc/Core/Solver/*.pdb build_msvc/tmp/lib/omc/cpp/msvc
cp -u build_msvc/Core/System/*.pdb build_msvc/tmp/lib/omc/cpp/msvc
#cp -u build_msvc/SimCoreFactory/OMCFactory/*.pdb build_msvc/tmp/lib/omc/cpp/msvc
cp -u build_msvc/Core/DataExchange/*.pdb build_msvc/tmp/lib/omc/cpp/msvc
#cp -u build_msvc/Core/Math/*.pdb build_msvc/tmp/lib/omc/cpp/msvc
cp -u Build_MSVC/Solver/Newton/*.pdb Build_MSVC/tmp/lib/omc/cpp/msvc
cp -u Build_MSVC/Solver/Euler/*.pdb Build_MSVC/tmp/lib/omc/cpp/msvc
cp -u Build_MSVC/Core/SimController/*.pdb Build_MSVC/tmp/lib/omc/cpp/msvc
cp -u Build_MSVC/Core/Modelica/*.pdb Build_MSVC/tmp/lib/omc/cpp/msvc
#cp -u Build_MSVC/Core/ModelicaExternalC/*.pdb Build_MSVC/tmp/lib/omc/cpp/msvc
cp -u Build_MSVC/Core/SimulationSettings/*.pdb Build_MSVC/tmp/lib/omc/cpp/msvc
cp -u Build_MSVC/Core/Solver/*.pdb Build_MSVC/tmp/lib/omc/cpp/msvc
cp -u Build_MSVC/Core/System/*.pdb Build_MSVC/tmp/lib/omc/cpp/msvc
#cp -u Build_MSVC/SimCoreFactory/OMCFactory/*.pdb Build_MSVC/tmp/lib/omc/cpp/msvc
cp -u Build_MSVC/Core/DataExchange/*.pdb Build_MSVC/tmp/lib/omc/cpp/msvc
#cp -u Build_MSVC/Core/Math/*.pdb Build_MSVC/tmp/lib/omc/cpp/msvc
endif


# move folder to build dir
cp -R build_msvc/tmp/* $(builddir_build)
cp -R Build_MSVC/tmp/* $(builddir_build)


install: runtimeCpp
Expand Down

0 comments on commit e19799f

Please sign in to comment.