Revert "Remove static link dependencies of dynamic runtime"

This reverts commit b0a5479, because the msvc build does not find OMCppOMCFactory.lib.
OpenModelica · Mar 16, 2016 · a801b41 · a801b41
1 parent df9f302
commit a801b41
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/SimulationRuntime/cpp/Core/SimController/CMakeLists.txt b/SimulationRuntime/cpp/Core/SimController/CMakeLists.txt
@@ -9,11 +9,11 @@ if(NOT BUILD_SHARED_LIBS)
 endif(NOT BUILD_SHARED_LIBS)
 
 include_directories(${SUNDIALS_INCLUDE_DIR}/cvodes ${SUNDIALS_INCLUDE_DIR}/nvector ${SUNDIALS_INCLUDE_DIR}/sundials ${SUNDIALS_INCLUDE_DIR}/kinsol ${SUNDIALS_INCLUDE_DIR})
-target_link_libraries(${SimControllerName} ${OMCFactoryName} ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
+target_link_libraries(${SimControllerName} ${OMCFactoryName}_static ${ExtensionUtilitiesName} ${ModelicaUtilitiesName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
 add_precompiled_header(${SimControllerName} Include/Core/Modelica.h)
 
-install(TARGETS ${SimControllerName} DESTINATION ${LIBINSTALLEXT})
-install(FILES
+install (TARGETS ${SimControllerName} DESTINATION ${LIBINSTALLEXT})
+install (FILES
   ${CMAKE_SOURCE_DIR}/Include/Core/SimController/ISimData.h
   ${CMAKE_SOURCE_DIR}/Include/Core/SimController/ISimObjects.h
   ${CMAKE_SOURCE_DIR}/Include/Core/SimController/ISimController.h

diff --git a/SimulationRuntime/cpp/Core/SimulationSettings/CMakeLists.txt b/SimulationRuntime/cpp/Core/SimulationSettings/CMakeLists.txt
@@ -9,7 +9,7 @@ if(NOT BUILD_SHARED_LIBS)
 endif(NOT BUILD_SHARED_LIBS)
 
 include_directories(${SUNDIALS_INCLUDE_DIR}/cvodes ${SUNDIALS_INCLUDE_DIR}/nvector ${SUNDIALS_INCLUDE_DIR}/sundials ${SUNDIALS_INCLUDE_DIR})
-target_link_libraries(${SimulationSettings} ${OMCFactoryName} ${Boost_LIBRARIES})
+target_link_libraries( ${SimulationSettings} ${OMCFactoryName}_static ${Boost_LIBRARIES})
 add_precompiled_header(${SimulationSettings} Include/Core/Modelica.h)
 
 install(TARGETS ${SimulationSettings} DESTINATION ${LIBINSTALLEXT})

diff --git a/SimulationRuntime/cpp/Core/System/CMakeLists.txt b/SimulationRuntime/cpp/Core/System/CMakeLists.txt
@@ -17,7 +17,7 @@ if(NOT BUILD_SHARED_LIBS)
 endif(NOT BUILD_SHARED_LIBS)
 
 include_directories(${SUNDIALS_INCLUDE_DIR}/cvodes ${SUNDIALS_INCLUDE_DIR}/nvector ${SUNDIALS_INCLUDE_DIR}/sundials ${SUNDIALS_INCLUDE_DIR}/kinsol ${SUNDIALS_INCLUDE_DIR})
-target_link_libraries(${SystemName} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES} ${OMCFactoryName} ${SimulationSettings} ${ExtensionUtilitiesName})
+target_link_libraries (${SystemName} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES} ${OMCFactoryName}_static ${SimulationSettings} ${ExtensionUtilitiesName})
 add_precompiled_header(${SystemName} Include/Core/Modelica.h)
 
 install(TARGETS ${SystemName} DESTINATION ${LIBINSTALLEXT})

diff --git a/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/CMakeLists.txt b/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/CMakeLists.txt
@@ -6,6 +6,11 @@ add_library(${OMCFactoryName} OMCFactory.cpp)
 
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${OMCFactoryName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
+else(NOT BUILD_SHARED_LIBS)
+  # this is needed for link dependencies of some shared libs:
+  # SimController, SimulationSettings, System
+  add_library(${OMCFactoryName}_static STATIC OMCFactory.cpp)
+  set_target_properties(${OMCFactoryName}_static PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
 endif(NOT BUILD_SHARED_LIBS)
 
 include_directories(${SUNDIALS_INCLUDE_DIR}/cvodes ${SUNDIALS_INCLUDE_DIR}/nvector ${SUNDIALS_INCLUDE_DIR}/sundials ${SUNDIALS_INCLUDE_DIR}/kinsol ${SUNDIALS_INCLUDE_DIR})