- fix for analyzation_mode on Linux

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19843 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 28, 2014 · 75f20f7 · 75f20f7
1 parent 15287c2
commit 75f20f7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/SimulationRuntime/cpp/Include/Core/Utils/extension/impl/library_impl.hpp b/SimulationRuntime/cpp/Include/Core/Utils/extension/impl/library_impl.hpp
@@ -14,6 +14,7 @@
 #ifndef BOOST_EXTENSION_LIBRARY_IMPL_HPP
 #define BOOST_EXTENSION_LIBRARY_IMPL_HPP
 
+#include <iostream>
 
 
 #include <cstring>

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSystemOMCFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSystemOMCFactory.h
@@ -2,7 +2,7 @@
 
 #include <Policies/SystemOMCFactory.h>
 #include <System/AlgLoopSolverFactory.h>
-#include <SimController/iSimData.h>
+#include <SimController/ISimData.h>
 
 /*
 Policy class to create a OMC-,  Modelica- system or AlgLoopSolver

diff --git a/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/CMakeLists.txt b/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/CMakeLists.txt
@@ -8,7 +8,12 @@ IF(ANALYZATION_MODE)
 	add_library(${OMCFactoryName} STATIC OMCFactory.cpp StaticOMCFactory.cpp)
 	#LINK_DIRECTORIES(${CMAKE_SOURCE_DIR}/../../../../build/lib/omc/${LIBINSTALLEXT})
 	include_directories(${SUNDIALS_INCLUDE_DIR}/cvodes ${SUNDIALS_INCLUDE_DIR}/nvector  ${SUNDIALS_INCLUDE_DIR}/sundials ${SUNDIALS_INCLUDE_DIR})
-	target_link_libraries( ${OMCFactoryName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${NewtonName} ${CVodeName} ${SimControllerName})
+
+	if (UNIX)
+		target_link_libraries( ${OMCFactoryName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${NewtonName} ${CVodeName} ${SimControllerName} ${CMAKE_DL_LIBS})
+	else (UNIX)
+		target_link_libraries( ${OMCFactoryName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${NewtonName} ${CVodeName} ${SimControllerName})
+	endif(UNIX)
 ELSE(ANALYZATION_MODE)
 	# add the system default implementation library
 	add_library(${OMCFactoryName} STATIC OMCFactory.cpp)
@@ -43,4 +48,4 @@ install (FILES
   install (FILES ${CMAKE_SOURCE_DIR}/Include/SimCoreFactory/OMCFactory/OMCFactory.h DESTINATION include/omc/cpp/SimCoreFactory/OMCFactory/)
 ENDIF(ANALYZATION_MODE)
 
-install (FILES ${CMAKE_SOURCE_DIR}/Include/SimCoreFactory/ObjectFactory.h DESTINATION include/omc/cpp/SimCoreFactory)
+install (FILES ${CMAKE_SOURCE_DIR}/Include/SimCoreFactory/ObjectFactory.h DESTINATION include/omc/cpp/SimCoreFactory)