more fixes for building OMSICpp on MinGW

- link with shlwapi as is needed by fmil lib - revert to OMC_LIB from LIB_OMC as is actually the libOpenModelicaCompiler in that case - propagate LIB_OMC to more parts when building OMSICpp - guard with IF(MSVC) installation of $TARGET_PDB_FILE
OpenModelica · Jun 8, 2019 · 3ae6d2d · 3ae6d2d
1 parent 8674038
commit 3ae6d2d
Show file tree

Hide file tree

Showing 28 changed files with 66 additions and 10 deletions.
diff --git a/OMCompiler/SimulationRuntime/OMSICpp/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/CMakeLists.txt
@@ -695,11 +695,15 @@ 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" "fmilib" 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}")
+    MESSAGE(FATAL_ERROR "Could not find FMI library \"libfmilib\" or \"libfmilib_shared${CMAKE_SHARED_LIBRARY_SUFFIX}\" in ${FMILIB_LIBRARY_RELEASE_HOME}")
   ENDIF()
 
+  IF (WIN32)
+   SET(FMILIB_LIB_EXTRA "shlwapi") # adrpo: we need to link with shlwapi on Windows for fmil
+  ENDIF(WIN32)
+
   # Find OMSIBase library
   FIND_LIBRARY(OMSIBASE_LIB NAMES "OMSIBase_static" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${OMSIBASELIB_LIBRARY_RELEASE_HOME} )
   IF(NOT OMSIBASE_LIB)

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/Makefile.omdev.mingw b/OMCompiler/SimulationRuntime/OMSICpp/Makefile.omdev.mingw
@@ -213,7 +213,7 @@ runtimeCPPmsvc: getMSVCversion
 omcCAPIinstall:
 	mkdir -p Build_CAPI;
 	(cd ./Build_CAPI; echo "change to Build_CAPI"; \
-	  cmake -G "MSYS Makefiles" -DPLATFORM=$(PLATFORM) -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DOMC_PATH="$(OMBUILDDIR)"  -DCMAKE_INSTALL_PREFIX:PATH="./lib" MAKE_CXX_COMPILER=g++ ../omcCAPI/; \
+	  cmake -G "MSYS Makefiles" -DPLATFORM=$(PLATFORM) -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DLIB_OMC=$(LIB_OMC) -DOMC_PATH="$(OMBUILDDIR)"  -DCMAKE_INSTALL_PREFIX:PATH="./lib" MAKE_CXX_COMPILER=g++ ../omcCAPI/; \
 	  $(MAKE) install;)
 	(cp -puf Build_CAPI/OMCAPIInterface* $(OMBUILDDIR)/bin/)
 	(cp -puf Build_CAPI/*.dll* $(OMBUILDDIR)/bin/)

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/omcCAPI/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/omcCAPI/CMakeLists.txt
@@ -72,10 +72,10 @@ 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} ${LIB_OMC} ${FMI_LIB} ${OMCGC_LIB})
+TARGET_LINK_LIBRARIES(${OMCName} ${MODELICAEX_LIB} ${OMCRUNTIME_LIB} ${OMC_LIB} ${FMI_LIB} ${OMCGC_LIB})
 #IF(ENABLE_CAPI_TESTS)
     ADD_EXECUTABLE(OMCAPIInterface src/OMCTest.cpp)
-    TARGET_LINK_LIBRARIES(OMCAPIInterface ${OMCName}  ${Boost_LIBRARIES} pthread)
+    TARGET_LINK_LIBRARIES(OMCAPIInterface ${OMCName} ${Boost_LIBRARIES} pthread)
     INSTALL(TARGETS OMCAPIInterface DESTINATION ./)
 #ENDIF(ENABLE_CAPI_TESTS)
 INSTALL(TARGETS ${OMCName} DESTINATION ${OMC_LIB_PATH})

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/omsi/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/omsi/CMakeLists.txt
@@ -41,8 +41,10 @@ IF(BUILD_SHARED_LIBS)
 
 set_target_properties(${OSUName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
 
+IF(MSVC)
 install(FILES $<TARGET_PDB_FILE:${OSUSimName}> DESTINATION bin OPTIONAL)
 #install(FILES $<TARGET_PDB_FILE:${OSUName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 
 install(TARGETS ${OSUSimName} DESTINATION bin)
 ENDIF(BUILD_SHARED_LIBS)

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/DataExchange/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/DataExchange/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${DataExchangeName} SimData.cpp FactoryExport.cpp XmlPropertyReader.
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${DataExchangeName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
  install(FILES $<TARGET_PDB_FILE:${DataExchangeName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 if(NOT BOOST_STATIC_LINKING)

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/Math/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/Math/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${MathName} ArrayOperations.cpp Functions.cpp FactoryExport.cpp)
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${MathName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
    install(FILES $<TARGET_PDB_FILE:${MathName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 target_link_libraries(${MathName} ${Boost_LIBRARIES} ${UMFPACK_LIB} ${LAPACK_LIBRARIES} ${ModelicaName})

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/SimController/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/SimController/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${SimControllerName} Configuration.cpp  FactoryExport.cpp Initializa
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${SimControllerName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
  install(FILES $<TARGET_PDB_FILE:${SimControllerName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 if(REDUCE_DAE)
 target_link_libraries(${SimControllerName} ${OMCFactoryName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${ReduceDAEName})

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/SimulationSettings/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/SimulationSettings/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${SimulationSettings} GlobalSettings.cpp Factory.cpp FactoryExport.c
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${SimulationSettings} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
  install(FILES $<TARGET_PDB_FILE:${SimulationSettings}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 target_link_libraries(${SimulationSettings} ${OMCFactoryName} ${Boost_LIBRARIES}  ${ModelicaName})

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/Solver/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/Solver/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${SolverName} SolverDefaultImplementation.cpp AlgLoopSolverDefaultIm
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${SolverName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
  install(FILES $<TARGET_PDB_FILE:${SolverName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 target_link_libraries(${SolverName} ${MathName} ${Boost_LIBRARIES} ${ExtensionUtilitiesName})

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/System/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/System/CMakeLists.txt
@@ -12,7 +12,7 @@ set(BASE_LIB "" CACHE INTERNAL "" )
 # add the system default implementation library
 if(USE_FMILIB)
 add_library(${SystemName} LinearAlgLoopDefaultImplementation.cpp NonLinearAlgLoopDefaultImplementation.cpp AlgLoopSolverFactory.cpp EventHandling.cpp DiscreteEvents.cpp ContinuousEvents.cpp SystemDefaultImplementation.cpp SimObjects.cpp SimVars.cpp OSUSystem.cpp FactoryExport.cpp)
-target_link_libraries(${SystemName} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES} ${OMCFactoryName} ${SimulationSettings} ${FMILIB_LIB}  ${ExtensionUtilitiesName})
+target_link_libraries(${SystemName} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES} ${OMCFactoryName} ${SimulationSettings} ${FMILIB_LIB} ${FMILIB_LIB_EXTRA} ${ExtensionUtilitiesName})
 else(USE_FMILIB)
 add_library(${SystemName} LinearAlgLoopDefaultImplementation.cpp NonLinearAlgLoopDefaultImplementation.cpp AlgLoopSolverFactory.cpp EventHandling.cpp DiscreteEvents.cpp ContinuousEvents.cpp SystemDefaultImplementation.cpp SimObjects.cpp SimVars.cpp  FactoryExport.cpp)
 target_link_libraries(${SystemName} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES} ${OMCFactoryName} ${SimulationSettings} ${ExtensionUtilitiesName})
@@ -21,7 +21,9 @@ endif(USE_FMILIB)
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${SystemName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
   install(FILES $<TARGET_PDB_FILE:${SystemName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/Utils/Modelica/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/Utils/Modelica/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${ModelicaUtilitiesName} ModelicaUtilities.cpp ModelicaSimulationErr
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${ModelicaUtilitiesName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
  install(FILES $<TARGET_PDB_FILE:${ModelicaUtilitiesName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 target_link_libraries (${ModelicaUtilitiesName} ${Boost_LIBRARIES}  ${ModelicaName})

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/Utils/extension/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/Utils/extension/CMakeLists.txt
@@ -11,7 +11,9 @@ endif(NOT BOOST_STATIC_LINKING)
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${ExtensionUtilitiesName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
   install(FILES $<TARGET_PDB_FILE:${ExtensionUtilitiesName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/FMU/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/FMU/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${FMUName} FMULogger.cpp)
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${FMUName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
   install(FILES $<TARGET_PDB_FILE:${FMUName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 target_link_libraries(${FMUName} ${ExtensionUtilitiesName}  ${ModelicaName})

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/ARKode/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/ARKode/CMakeLists.txt
@@ -7,13 +7,17 @@ add_library(${ARKodeName} ARKode.cpp ARKodeSettings.cpp FactoryExport.cpp)
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${ARKodeName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
   install(FILES $<TARGET_PDB_FILE:${ARKodeName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 target_link_libraries(${ARKodeName} ${SolverName} ${ExtensionUtilitiesName} ${Boost_LIBRARIES} ${SUNDIALS_LIBRARIES})
 add_precompiled_header(${ARKodeName} runtime/include/Core/Modelica.h)
 
+IF(MSVC)
 install(FILES $<TARGET_PDB_FILE:${ARKodeName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 
 install(TARGETS ${ARKodeName} DESTINATION ${LIBINSTALLEXT})
 install(FILES

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Broyden/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Broyden/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${BroydenName} Broyden.cpp BroydenSettings.cpp FactoryExport.cpp )
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${BroydenName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
  install(FILES $<TARGET_PDB_FILE:${BroydenName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 target_link_libraries(${BroydenName} ${SolverName} ${ExtensionUtilitiesName} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES}  ${ModelicaName})

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/CVode/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/CVode/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${CVodeName} CVode.cpp CVodeSettings.cpp FactoryExport.cpp)
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${CVodeName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
   install(FILES $<TARGET_PDB_FILE:${CVodeName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 message(STATUS "Sundials Libraries used for linking:")

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/CppDASSL/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/CppDASSL/CMakeLists.txt
@@ -20,7 +20,9 @@ endif(OPENMP_FOUND)
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${CppDASSLName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
   install(FILES $<TARGET_PDB_FILE:${CppDASSLName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 set_target_properties(${CppDASSLName} PROPERTIES COMPILE_DEFINITIONS "${CPPDASSL_COMPILE_DEFINITIONS}")

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Euler/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Euler/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${EulerName} Euler.cpp EulerSettings.cpp FactoryExport.cpp)
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${EulerName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
  install(FILES $<TARGET_PDB_FILE:${EulerName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 add_precompiled_header(${EulerName} runtime/include/Core/Modelica.h )

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Hybrj/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Hybrj/CMakeLists.txt
@@ -6,8 +6,10 @@ add_library(${HybrjName} Hybrj.cpp HybrjSettings.cpp FactoryExport.cpp)
 
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${HybrjName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
-    else(NOT BUILD_SHARED_LIBS)
-  install(FILES $<TARGET_PDB_FILE:${EulerName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
+  install(FILES $<TARGET_PDB_FILE:${HybrjName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 add_precompiled_header(${HybrjName} runtime/include/Solver/Modelica.h)

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/IDA/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/IDA/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${IDAName} IDA.cpp IDASettings.cpp FactoryExport.cpp)
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${IDAName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
  install(FILES $<TARGET_PDB_FILE:${IDAName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 target_link_libraries(${IDAName} ${SolverName} ${ExtensionUtilitiesName} ${Boost_LIBRARIES} ${SUNDIALS_LIBRARIES})

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Kinsol/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Kinsol/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${KinsolName} Kinsol.cpp KinsolLapack.cpp KinsolSettings.cpp Factory
 if(NOT BUILD_SHARED_LIBS)
     set_target_properties(${KinsolName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
     install(FILES $<TARGET_PDB_FILE:${KinsolName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 add_precompiled_header(${KinsolName} Include/Core/Modelica.h)

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/LinearSolver/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/LinearSolver/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${LinearSolverName} LinearSolver.cpp LinearSolverSettings.cpp Factor
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${LinearSolverName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
   install(FILES $<TARGET_PDB_FILE:${LinearSolverName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 add_precompiled_header(${LinearSolverName} runtime/include/Core/Modelica.h)

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Newton/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Newton/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${NewtonName} Newton.cpp NewtonSettings.cpp FactoryExport)
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${NewtonName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
  install(FILES $<TARGET_PDB_FILE:${NewtonName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 target_link_libraries(${NewtonName}  ${SolverName} ${ExtensionUtilitiesName} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES}  ${ModelicaName})

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Nox/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Nox/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${NoxName} Nox.cpp NoxSettings.cpp FactoryExport.cpp NoxLapackInterf
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${NoxName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
 else(NOT BUILD_SHARED_LIBS)
-install(FILES $<TARGET_PDB_FILE:${NoxName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+IF(MSVC)
+ install(FILES $<TARGET_PDB_FILE:${NoxName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 add_precompiled_header(${NoxName} runtime/include/Core/Modelica.h)

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Peer/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Peer/CMakeLists.txt
@@ -20,7 +20,9 @@ endif(OPENMP_FOUND)
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${PeerName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
   install(FILES $<TARGET_PDB_FILE:${PeerName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 set_target_properties(${PeerName} PROPERTIES COMPILE_DEFINITIONS "${PEER_COMPILE_DEFINITIONS}")

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/RK12/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/RK12/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${RK12Name} RK12.cpp RK12Settings.cpp FactoryExport.cpp )
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${RK12Name} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
- install(FILES $<TARGET_PDB_FILE:${NewtonName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+IF(MSVC)
+ install(FILES $<TARGET_PDB_FILE:${RK12Name}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 target_link_libraries(${RK12Name} ${SolverName} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES})

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/RTEuler/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/RTEuler/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${RTEulerName} RTEuler.cpp RTEulerSettings.cpp FactoryExport.cpp )
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${RTEulerName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
   install(FILES $<TARGET_PDB_FILE:${RTEulerName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 target_link_libraries (${RTEulerName} ${SolverName} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES})

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/UmfPack/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/UmfPack/CMakeLists.txt
@@ -7,7 +7,9 @@ add_library(${UmfPackName} UmfPack.cpp UmfPackSettings.cpp FactoryExport)
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${UmfPackName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
 else(NOT BUILD_SHARED_LIBS)
+IF(MSVC)
  install(FILES $<TARGET_PDB_FILE:${UmfPackName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+ENDIF(MSVC)
 endif(NOT BUILD_SHARED_LIBS)
 
 target_link_libraries(${UmfPackName}  ${SolverName}  ${MathName} ${SUITESPARSE_LIBRARIES} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES} ${UMFPACK_LIB})