Generate static OMCFactory for all targets

This is not nice, but at least a consistent escape of the dll hell.
OpenModelica · Mar 20, 2016 · 88cdf8e · 88cdf8e
1 parent 0a629c7
commit 88cdf8e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 27 deletions.
diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/OMCFactory/FactoryExport.h b/SimulationRuntime/cpp/Include/SimCoreFactory/OMCFactory/FactoryExport.h
diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/OMCFactory/OMCFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/OMCFactory/OMCFactory.h
@@ -21,18 +21,10 @@ typedef int LOADERRESULT;
 class ISimController;
 struct SimSettings;
 
-#if !defined(BOOST_EXTENSION_OMCFACTORY_DECL)
-  #if defined(RUNTIME_STATIC_LINKING)
-    #define BOOST_EXTENSION_OMCFACTORY_DECL
-  #else
-    #define BOOST_EXTENSION_OMCFACTORY_DECL BOOST_EXTENSION_IMPORT_DECL
-  #endif
-#endif
-
 /**
  * Create a dynamically linked simulator and serve for solver factories
  */
-class BOOST_EXTENSION_OMCFACTORY_DECL OMCFactory
+class OMCFactory
 {
 public:
   OMCFactory();

diff --git a/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/CMakeLists.txt b/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.9)
 
 project(${OMCFactoryName})
 
-add_library(${OMCFactoryName} OMCFactory.cpp)
+add_library(${OMCFactoryName} STATIC OMCFactory.cpp)
 
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${OMCFactoryName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")

diff --git a/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/OMCFactory.cpp b/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/OMCFactory.cpp
@@ -3,8 +3,6 @@
  *  @{
  */
 
-#include <SimCoreFactory/OMCFactory/FactoryExport.h>
-
 #include <Core/ModelicaDefine.h>
 #include <Core/Modelica.h>