Fix OMSICpp build on MSVC

- change OMC_LIB to LIB_OMC inside the OMSICpp project and the makefiles - properly propagate $LIB_OMC via cmake
OpenModelica · Jun 7, 2019 · 33e993f · 33e993f
1 parent 3134605
commit 33e993f
Show file tree

Hide file tree

Showing 10 changed files with 342 additions and 331 deletions.
diff --git a/Makefile.omdev.mingw b/Makefile.omdev.mingw
diff --git a/OMCompiler/.gitignore b/OMCompiler/.gitignore
@@ -101,9 +101,13 @@ SimulationRuntime/opc/ua/open62541.c
 SimulationRuntime/opc/ua/libomopcua.dll
 SimulationRuntime/OMSI/Build_dynamic/
 SimulationRuntime/OMSI/Build_static/
+SimulationRuntime/OMSI/Build_MSVC/
+SimulationRuntime/OMSI/Build_MSVC_static/
 SimulationRuntime/OMSIC/Build_dynamic/
 SimulationRuntime/OMSIC/Build_static/
 
+
+
 # OpenModelicaSetup
 Compiler/OpenModelicaSetup
 # Compiler files

diff --git a/OMCompiler/Makefile.omdev.mingw b/OMCompiler/Makefile.omdev.mingw
@@ -21,6 +21,11 @@ ifeq ($(OMBUILDDIR),)
 OMBUILDDIR=$(CURDIR)/build
 endif
 
+builddir_build=$(OMBUILDDIR)
+builddir_bin=$(OMBUILDDIR)/bin
+builddir_lib=$(OMBUILDDIR)/lib/omc
+builddir_inc=$(OMBUILDDIR)/include/omc
+
 ifeq ($(BUILDTYPE),)
 BUILDTYPE=$(BuildType)
 endif
@@ -451,10 +456,10 @@ nox_msvc: getMSVCversion 3rdParty/trilinos-nox/CMakeLists.txt
 
 
 omcCAPImsvcinstall:
-	$(MAKE) -C SimulationRuntime/omsicpp/ -f Makefile.omdev.mingw omcCAPImsvc OMBUILDDIR=$(OMBUILDDIR)
+	$(MAKE) -C SimulationRuntime/OMSICpp/ -f Makefile.omdev.mingw omcCAPImsvc OMBUILDDIR=$(OMBUILDDIR)
 
-runtimeCPPmsvcinstall: CMinpack_msvc fmil_msvc sundials_msvc copycppmsvcheader
-	$(MAKE) -C SimulationRuntime/omsicpp/ -f Makefile.omdev.mingw runtimeCPPmsvc OMBUILDDIR=$(OMBUILDDIR)
+runtimeCPPmsvcinstall: CMinpack_msvc fmil_msvc sundials_msvc copycppmsvcheader OMSIBaseMSVC
+	$(MAKE) -C SimulationRuntime/OMSICpp/ -f Makefile.omdev.mingw runtimeCPPmsvc OMBUILDDIR=$(OMBUILDDIR)
 	cp -p $(BOOST_PATH_MSVC)/lib/*vc*.dll $(OMBUILDDIR)/bin/msvc
 	cp -p $(BOOST_PATH_MSVC)/lib/*vc*.lib $(OMBUILDDIR)/lib/omc/omsicpp/msvc
 

diff --git a/OMCompiler/Makefile.omsi.common b/OMCompiler/Makefile.omsi.common
@@ -45,39 +45,37 @@ OMSIBase: sundials $(LAPACK_TARGET) expat
 
 OMSIBaseMSVC: getMSVCversion
 	test -f """${VSCOMNTOOLS}/../../VC/vcvarsall.bat"""
-	echo 'Build the cppRuntime with MSVC' buildtype: $(BUILDTYPE)
+	#echo 'Build the cppRuntime with MSVC' buildtype: $(BUILDTYPE)
 	#rm -rf Build_MSVC
-	mkdir -p Build_MSVC
-	echo call '"${VSCOMNTOOLS}\\..\\..\\VC\\vcvarsall.bat" ${VCVARS_PARAMS}' > Build_MSVC/build.bat
+	#mkdir -p SimulationRuntime/OMSI/Build_MSVC
+	#echo call '"${VSCOMNTOOLS}\\..\\..\\VC\\vcvarsall.bat" ${VCVARS_PARAMS}' > SimulationRuntime/OMSI/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 -DPLATFORM="dynamic" $(CMAKE_FLAGS) -DIS_MINGW32=OFF -DIS_MINGW64=OFF -DCMAKE_INSTALL_PREFIX:PATH=./tmp ../ -G "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> Build_MSVC/build.bat
+	#echo echo Running CMake from '%OMDEV%\\bin\\cmake\\bin\\cmake' >> SimulationRuntime/OMSI/Build_MSVC/build.bat
+	#echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DPLATFORM="dynamic" $(CMAKE_FLAGS) -DLIB_OMC=$(LIB_OMC) -DIS_MINGW32=OFF -DIS_MINGW64=OFF -DCMAKE_INSTALL_PREFIX:PATH=./tmp ../ -G "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> SimulationRuntime/OMSI/Build_MSVC/build.bat
 
 	# 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 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
+	#echo set MAKEFLAGS="" >> SimulationRuntime/OMSI/Build_MSVC/build.bat
+	#echo echo Running NMake JOM >> SimulationRuntime/OMSI/Build_MSVC/build.bat
+	#echo %OMDEV%\\tools\\jom\\jom.exe /f Makefile install >> SimulationRuntime/OMSI/Build_MSVC/build.bat
+	#cd ./SimulationRuntime/OMSI/Build_MSVC; echo "change to Build_MSVC"; cmd /c build.bat
 
 	echo 'Build cppRuntime (static) with MSVC'
 	#rm -rf Build_MSVC_static
-	mkdir -p Build_MSVC_static
-	echo call '"${VSCOMNTOOLS}\\..\\..\\VC\\vcvarsall.bat" ${VCVARS_PARAMS}' > Build_MSVC_static/build.bat
+	mkdir -p SimulationRuntime/OMSI/Build_MSVC_static
+	echo call '"${VSCOMNTOOLS}\\..\\..\\VC\\vcvarsall.bat" ${VCVARS_PARAMS}' > SimulationRuntime/OMSI/Build_MSVC_static/build.bat
 
-	echo echo Running CMake from '%OMDEV%\\bin\\cmake\\bin\\cmake' >> Build_MSVC_static/build.bat
-	echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DPLATFORM="static" $(CMAKE_FLAGS) -DIS_MINGW32=OFF -DIS_MINGW64=OFF -DCMAKE_INSTALL_PREFIX:PATH=./tmp ../ -G "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> Build_MSVC_static/build.bat
+	echo echo Running CMake from '%OMDEV%\\bin\\cmake\\bin\\cmake' >> SimulationRuntime/OMSI/Build_MSVC_static/build.bat
+	echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DPLATFORM="static" $(CMAKE_FLAGS) -DLIB_OMC=$(LIB_OMC) -DIS_MINGW32=OFF -DIS_MINGW64=OFF -DCMAKE_INSTALL_PREFIX:PATH=./tmp ../ -G "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> SimulationRuntime/OMSI/Build_MSVC_static/build.bat
 
 	# for some reason, the environment variable 'MAKEFLAGS' was set to 'w' on my and Niklas' machine?!
-	echo set MAKEFLAGS="" >> Build_MSVC_static/build.bat
-	echo echo Running NMake JOM >> Build_MSVC_static/build.bat
-	echo %OMDEV%\\tools\\jom\\jom.exe /f Makefile install >> Build_MSVC_static/build.bat
-	cd ./Build_MSVC_static; echo "change to Build_MSVC_static";\
-	cmd /c build.bat
+	echo set MAKEFLAGS="" >> SimulationRuntime/OMSI/Build_MSVC_static/build.bat
+	echo echo Running NMake JOM >> SimulationRuntime/OMSI/Build_MSVC_static/build.bat
+	echo %OMDEV%\\tools\\jom\\jom.exe /f Makefile install >> SimulationRuntime/OMSI/Build_MSVC_static/build.bat
+	cd ./SimulationRuntime/OMSI/Build_MSVC_static; echo "change to Build_MSVC_static"; cmd /c build.bat
 
 	# move folder to build dir
-	cp -R --verbose Build_MSVC/tmp/* $(builddir_build)
-	cp -R --verbose Build_MSVC_static/tmp/lib/* $(builddir_build)/lib
+	#cp -R --verbose ./SimulationRuntime/OMSI/Build_MSVC/tmp/* $(builddir_build)
+	cp -R --verbose ./SimulationRuntime/OMSI/Build_MSVC_static/tmp/lib/* $(builddir_build)/lib
 
 OMSIBaseClean:
 	cd SimulationRuntime/OMSI; \
@@ -119,7 +117,7 @@ OMSICPP:
 	$(MAKE) -C SimulationRuntime/OMSICpp/ -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR)
 
 OMSICPPinstall: copycppheader OMSICPP
-	$(MAKE) -C SimulationRuntime/OMSICpp/ -f $(defaultMakefileTarget) CC="$(CC)" CXX="$(CXX)" install ANALYZATION_MODE="$(ANALYZATION_MODE)" $(CMAKE_ARGS) OMBUILDDIR=$(OMBUILDDIR) OMC_LIB=$(LIB_OMC)
+	$(MAKE) -C SimulationRuntime/OMSICpp/ -f $(defaultMakefileTarget) CC="$(CC)" CXX="$(CXX)" install ANALYZATION_MODE="$(ANALYZATION_MODE)" $(CMAKE_ARGS) OMBUILDDIR=$(OMBUILDDIR) LIB_OMC=$(LIB_OMC)
 	test ! `uname` = Darwin || install_name_tool -id @rpath/OMSICpp/libOMCppCVode.dylib $(OMBUILDDIR)/$(LIB_OMC)/OMSICpp/libOMCppCVode.dylib
 	test ! `uname` = Darwin || install_name_tool -id @rpath/OMSICpp/libOMCppDataExchange.dylib $(OMBUILDDIR)/$(LIB_OMC)/OMSICpp/libOMCppDataExchange.dylib
 	test ! `uname` = Darwin || install_name_tool -id @rpath/OMSICpp/libOMCppEuler.dylib $(OMBUILDDIR)/$(LIB_OMC)/OMSICpp/libOMCppEuler.dylib

diff --git a/OMCompiler/SimulationRuntime/OMSI/solver/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSI/solver/CMakeLists.txt
@@ -36,7 +36,6 @@ ENDIF(MSVC)
 ############################
   #set sundials solvers include and library directories
   IF(MSVC)
-
     SET(SUNDIALS_INLCUDE_HOME  "${CMAKE_SOURCE_DIR}/../../3rdParty/sundials/build_msvc/include/")
     SET(SUNDIALS_LIBRARY_RELEASE_HOME "${CMAKE_SOURCE_DIR}/../../3rdParty/sundials/build_msvc/lib/")
   ELSE(MSVC)

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/CMakeLists.txt
@@ -131,9 +131,9 @@ SET(MODELICAEXTERNALCDIR  "${CMAKE_SOURCE_DIR}/../../3rdParty/ModelicaExternalC/
 IF(NOT FMU_TARGET)
  IF(MSVC)
   MESSAGE(STATUS "MSVC")
-  SET(LIBINSTALLEXT "${CMAKE_INSTALL_PREFIX}/${OMC_LIB}/omsicpp/msvc" CACHE STRING "library directory" FORCE)
+  SET(LIBINSTALLEXT "${CMAKE_INSTALL_PREFIX}/${LIB_OMC}/omsicpp/msvc" CACHE STRING "library directory" FORCE)
  ELSE(MSVC)
-	 SET(LIBINSTALLEXT "${CMAKE_INSTALL_PREFIX}/${OMC_LIB}/omsicpp" CACHE STRING "library directory" FORCE)
+	 SET(LIBINSTALLEXT "${CMAKE_INSTALL_PREFIX}/${LIB_OMC}/omsicpp" CACHE STRING "library directory" FORCE)
  ENDIF(MSVC)
 ENDIF(NOT FMU_TARGET)
 MESSAGE(STATUS "Using library folder extension " ${LIBINSTALLEXT})
@@ -577,14 +577,14 @@ IF(USE_SUNDIALS)
     SET(SUNDIALS_LIBRARY_RELEASE_HOME "${CMAKE_SOURCE_DIR}/../../3rdParty/sundials/build_msvc/lib/")
   ELSE(MSVC)
     SET(SUNDIALS_INLCUDE_HOME  ${CMAKE_INSTALL_PREFIX}/include/omc/c/sundials)
-    SET(SUNDIALS_LIBRARY_RELEASE_HOME ${CMAKE_INSTALL_PREFIX}/${OMC_LIB})
+    SET(SUNDIALS_LIBRARY_RELEASE_HOME ${CMAKE_INSTALL_PREFIX}/${LIB_OMC})
   ENDIF(MSVC)
 
   MESSAGE(STATUS "Sundials include:")
   MESSAGE(STATUS "${SUNDIALS_INLCUDE_HOME}")
   MESSAGE(STATUS "Sundials library for omsicpp:")
   MESSAGE(STATUS "${SUNDIALS_LIBRARY_RELEASE_HOME}")
-   MESSAGE(STATUS "${CMAKE_INSTALL_PREFIX}/${OMC_LIB}")
+   MESSAGE(STATUS "${CMAKE_INSTALL_PREFIX}/${LIB_OMC}")
 
 
   SET(SUNDIALS_INCLUDE_DIR "${SUNDIALS_INLCUDE_HOME}")
@@ -640,12 +640,12 @@ IF(USE_SUNDIALS)
 #    MESSAGE(FATAL_ERROR "Could not find libsundials_ARKODE!")
 #  ENDIF()
 
-  FIND_LIBRARY(SUNDIALS_IDA_LIB "sundials_idas" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${SUNDIALS_LIBRARY_RELEASE_HOME}  )
+  FIND_LIBRARY(SUNDIALS_IDA_LIB "sundials_idas" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${SUNDIALS_LIBRARY_RELEASE_HOME} )
   IF(NOT SUNDIALS_IDA_LIB)
     MESSAGE(FATAL_ERROR "Could not find libsundials_ida!")
   ENDIF()
 
-  FIND_LIBRARY(SUNDIALS_KINSOL_LIB "sundials_kinsol"NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${SUNDIALS_LIBRARY_RELEASE_HOME} )
+  FIND_LIBRARY(SUNDIALS_KINSOL_LIB "sundials_kinsol" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${SUNDIALS_LIBRARY_RELEASE_HOME} )
   IF(NOT SUNDIALS_KINSOL_LIB)
     MESSAGE(FATAL_ERROR "Could not find libsundials_kinsol!")
   ENDIF()
@@ -676,8 +676,8 @@ IF(USE_OMSI)
     SET(OMSIBASELIB_LIBRARY_RELEASE_HOME "${CMAKE_INSTALL_PREFIX}/lib/omc/omsi")
   ELSE()
     SET(FMILIB_INLCUDE_HOME "${CMAKE_SOURCE_DIR}/../../3rdParty/FMIL/install/include")
-    SET(FMILIB_LIBRARY_RELEASE_HOME  "${CMAKE_INSTALL_PREFIX}/${OMC_LIB}")
-    SET(OMSIBASELIB_LIBRARY_RELEASE_HOME "${CMAKE_INSTALL_PREFIX}/${OMC_LIB}/omsi")
+    SET(FMILIB_LIBRARY_RELEASE_HOME  "${CMAKE_INSTALL_PREFIX}/${LIB_OMC}")
+    SET(OMSIBASELIB_LIBRARY_RELEASE_HOME "${CMAKE_INSTALL_PREFIX}/${LIB_OMC}/omsi")
   ENDIF()
 
   MESSAGE(STATUS "FMI lib include:")
@@ -695,16 +695,16 @@ IF(USE_OMSI)
     INCLUDE_DIRECTORIES(${FMILIB_INCLUDE_DIR})
   ENDIF()
 
-  FIND_LIBRARY(FMILIB_LIB NAMES  "fmilib_shared" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${FMILIB_LIBRARY_RELEASE_HOME} )
+  FIND_LIBRARY(FMILIB_LIB NAMES "fmilib_shared" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${FMILIB_LIBRARY_RELEASE_HOME} )
   IF(NOT FMILIB_LIB)
     MESSAGE(FATAL_ERROR "Could not find FMI library \"libfmilib_shared${CMAKE_SHARED_LIBRARY_SUFFIX}\" in ${FMILIB_LIBRARY_RELEASE_HOME}")
   ENDIF()
 
   # Find OMSIBase library
-  FIND_LIBRARY(OMSIBASE_LIB NAMES  "OMSIBase_static" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${OMSIBASELIB_LIBRARY_RELEASE_HOME} )
+  FIND_LIBRARY(OMSIBASE_LIB NAMES "OMSIBase_static" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${OMSIBASELIB_LIBRARY_RELEASE_HOME} )
   IF(NOT OMSIBASE_LIB)
     MESSAGE(STATUS "LIB_OMC = ${LIB_OMC}")
-    MESSAGE(FATAL_ERROR "Could not find omsi base library in: ${OMSIBASELIB_LIBRARY_RELEASE_HOME}")
+    MESSAGE(FATAL_ERROR "Could not find OMSIBase library in: ${OMSIBASELIB_LIBRARY_RELEASE_HOME}")
   ENDIF()
 
 

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/Makefile.in b/OMCompiler/SimulationRuntime/OMSICpp/Makefile.in
@@ -32,7 +32,7 @@ BUILDTYPE=@CMAKE_BUILDTYPE@
 CMAKE_COMMANDS=@CMAKE_COMMANDS@
 CMAKE_ARGS=$(patsubst CMAKE_%, -D%, $(filter CMAKE_%, $(MAKEFLAGS)))
 
-CMAKE_FLAGS=-DCMAKE_BUILD_TYPE=$(BUILDTYPE) $(BOOST_ROOT_COMMAND) $(BOOST_STATIC_LINKING_COMMAND) $(CPP_03_COMMAND) $(BOOST_REALPATHS_COMMAND) $(PARALLEL_OUTPUT_COMMAND) $(RUNTIME_PROFILING_COMMAND) $(SCOREP_COMMAND) $(FMU_SUNDIALS_COMMAND) $(LOGGER_COMMAND) -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DCMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" -DLIBINSTALLEXT=$(LIBINSTALLEXT) -DOMC_LIB=$(LIB_OMC) -DSCOREP_HOME:STRING="$(SCOREP_HOME)" $(BUILD_DOC_COMMAND) $(CMAKE_ARGS) -DOpenMP_CXX_FLAGS="$(OMPCFLAGS)"
+CMAKE_FLAGS=-DCMAKE_BUILD_TYPE=$(BUILDTYPE) $(BOOST_ROOT_COMMAND) $(BOOST_STATIC_LINKING_COMMAND) $(CPP_03_COMMAND) $(BOOST_REALPATHS_COMMAND) $(PARALLEL_OUTPUT_COMMAND) $(RUNTIME_PROFILING_COMMAND) $(SCOREP_COMMAND) $(FMU_SUNDIALS_COMMAND) $(LOGGER_COMMAND) -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DCMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" -DLIBINSTALLEXT=$(LIBINSTALLEXT) -DLIB_OMC=$(LIB_OMC) -DSCOREP_HOME:STRING="$(SCOREP_HOME)" $(BUILD_DOC_COMMAND) $(CMAKE_ARGS) -DOpenMP_CXX_FLAGS="$(OMPCFLAGS)"
 
 runtimeCpp:
 	$(foreach PLATFORM, $(PLATFORMS), \

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/Makefile.omdev.mingw b/OMCompiler/SimulationRuntime/OMSICpp/Makefile.omdev.mingw
@@ -12,6 +12,7 @@ builddir_build=$(OMBUILDDIR)
 builddir_bin=$(OMBUILDDIR)/bin
 builddir_lib=$(OMBUILDDIR)/lib/omc
 builddir_inc=$(OMBUILDDIR)/include/omc
+LIB_OMC=lib/omc
 
 OMBUILDDIR_WIN=$(shell cygpath -w $$OMBUILDDIR)
 
@@ -153,7 +154,7 @@ runtimeCpp: omcCAPIinstall
 	$(foreach PLATFORM, $(PLATFORMS), \
 	  mkdir -p Build_$(PLATFORM); \
 	  (cd ./Build_$(PLATFORM); echo "change to Build_$(PLATFORM)"; \
-	   cmake -G "MSYS Makefiles" -DPLATFORM=$(PLATFORM) -DOMC_LIB=$(OMC_LIB) $(CMAKE_FLAGS) $(IS_MINGW32) $(IS_MINGW64) -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" MAKE_CXX_COMPILER=g++ ../; \
+	   cmake -G "MSYS Makefiles" -DPLATFORM=$(PLATFORM) -DLIB_OMC=$(LIB_OMC) $(CMAKE_FLAGS) $(IS_MINGW32) $(IS_MINGW64) -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" MAKE_CXX_COMPILER=g++ ../; \
 	   $(MAKE));)
 
 omcCAPImsvc: getMSVCversion
@@ -165,7 +166,7 @@ omcCAPImsvc: getMSVCversion
 
 	echo echo Running CMake from '%OMDEV%\\bin\\cmake\\bin\\cmake' >> Build_CAPI_MSVC/build.bat
 	echo echo using omc libraries from "$(OMBUILDDIR)" >> Build_CAPI_MSVC/build.bat
-	echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DOMC_PATH="$(OMBUILDDIR)/build"  -DCMAKE_INSTALL_PREFIX:PATH=./tmp ../omcCAPI/ -G "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> Build_CAPI_MSVC/build.bat
+	echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DOMC_PATH="$(OMBUILDDIR)/build" -DCMAKE_INSTALL_PREFIX:PATH=./tmp ../omcCAPI/ -G "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> Build_CAPI_MSVC/build.bat
 
 	# for some reason, the environment variable 'MAKEFLAGS' was set to 'w' on my and Niklas' machine?!
 	echo set MAKEFLAGS="" >> Build_CAPI_MSVC/build.bat
@@ -181,7 +182,7 @@ runtimeCPPmsvc: getMSVCversion
 	echo call '"${VSCOMNTOOLS}\\..\\..\\VC\\vcvarsall.bat" ${VCVARS_PARAMS}' > 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 -DPLATFORM="dynamic" $(CMAKE_FLAGS) -DIS_MINGW32=OFF -DIS_MINGW64=OFF  -DCMAKE_INSTALL_PREFIX:PATH=./tmp ../ -G "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> Build_MSVC/build.bat
+	echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DPLATFORM="dynamic" $(CMAKE_FLAGS) -DLIB_OMC=$(LIB_OMC) -DIS_MINGW32=OFF -DIS_MINGW64=OFF  -DCMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR_WIN)" ../ -G "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> Build_MSVC/build.bat
 
 	# for some reason, the environment variable 'MAKEFLAGS' was set to 'w' on my and Niklas' machine?!
 	echo set MAKEFLAGS="" >> Build_MSVC/build.bat
@@ -196,7 +197,7 @@ runtimeCPPmsvc: getMSVCversion
 	echo call '"${VSCOMNTOOLS}\\..\\..\\VC\\vcvarsall.bat" ${VCVARS_PARAMS}' > Build_MSVC_static/build.bat
 
 	echo echo Running CMake from '%OMDEV%\\bin\\cmake\\bin\\cmake' >> Build_MSVC_static/build.bat
-	echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DPLATFORM="static" $(CMAKE_FLAGS) -DIS_MINGW32=OFF -DIS_MINGW64=OFF -DCMAKE_INSTALL_PREFIX:PATH=./tmp ../ -G "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> Build_MSVC_static/build.bat
+	echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DPLATFORM="static" $(CMAKE_FLAGS) -DLIB_OMC=$(LIB_OMC) -DIS_MINGW32=OFF -DIS_MINGW64=OFF -DCMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR_WIN)" ../ -G "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe"' >> Build_MSVC_static/build.bat
 
 	# for some reason, the environment variable 'MAKEFLAGS' was set to 'w' on my and Niklas' machine?!
 	echo set MAKEFLAGS="" >> Build_MSVC_static/build.bat
@@ -206,8 +207,8 @@ runtimeCPPmsvc: getMSVCversion
 	cmd /c build.bat
 
 	# move folder to build dir
-	cp -R --verbose Build_MSVC/tmp/* $(builddir_build)
-	cp -R --verbose Build_MSVC_static/tmp/lib/* $(builddir_build)/lib
+	#cp -R --verbose Build_MSVC/tmp/* $(builddir_build)
+	#cp -R --verbose Build_MSVC_static/tmp/lib/* $(builddir_build)/lib
 
 omcCAPIinstall:
 	mkdir -p Build_CAPI;

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/omcCAPI/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/omcCAPI/CMakeLists.txt
@@ -19,11 +19,11 @@ IF(WIN32) # Check if we are on Windows
   IF(MSVC)
    SET(OMC_LIB_PATH "${OMC_PATH}/lib/omc/msvc")
   ELSE(MSVC)
-   SET(OMC_LIB_PATH "${OMC_PATH}/lib/omc")
+   SET(OMC_LIB_PATH "${OMC_PATH}/${LIB_OMC}")
    set(CMAKE_EXE_LINKER_FLAGS "-Wl,--stack,33554432")
   ENDIF(MSVC)
 ELSEIF(UNIX)
-  SET(OMC_LIB_PATH "${OMC_PATH}/lib/x86_64-linux-gnu/omc")
+  SET(OMC_LIB_PATH "${OMC_PATH}/${LIB_OMC}")
 ELSE(WIN32)
   MESSAGE(SEND_ERROR "You are on an unsupported platform! (Not Win32 or Unix)")
 ENDIF(WIN32)
@@ -72,7 +72,7 @@ ADD_DEFINITIONS(-DIMPORT_INTO=1)
 ADD_DEFINITIONS(-DBUILDING_OMC_DLL)
 
 ADD_LIBRARY(${OMCName} SHARED src/OMC.cpp)
-TARGET_LINK_LIBRARIES(${OMCName} ${MODELICAEX_LIB} ${OMCRUNTIME_LIB} ${OMC_LIB} ${FMI_LIB} ${OMCGC_LIB})
+TARGET_LINK_LIBRARIES(${OMCName} ${MODELICAEX_LIB} ${OMCRUNTIME_LIB} ${LIB_OMC} ${FMI_LIB} ${OMCGC_LIB})
 #IF(ENABLE_CAPI_TESTS)
     ADD_EXECUTABLE(OMCAPIInterface src/OMCTest.cpp)
     TARGET_LINK_LIBRARIES(OMCAPIInterface ${OMCName}  ${Boost_LIBRARIES} pthread)

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/omsi/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/omsi/CMakeLists.txt
@@ -24,8 +24,8 @@ install(TARGETS ${OSUName} DESTINATION ${LIBINSTALLEXT})
 
 IF(BUILD_SHARED_LIBS)
 
-    MESSAGE(STATUS "Set rpath for omsu simulation executable " ${OMC_LIB})
-    set(CMAKE_INSTALL_RPATH "$ORIGIN/../${OMC_LIB}/omsicpp/:$ORIGIN")
+    MESSAGE(STATUS "Set rpath for omsu simulation executable " ${LIB_OMC})
+    set(CMAKE_INSTALL_RPATH "$ORIGIN/../${LIB_OMC}/omsicpp/:$ORIGIN")
     SET(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
     #SET (CMAKE_EXE_LINKER_FLAGS
     #"${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,'$$ORIGIN/../${LibFolderExtension}/'" )