- change cmake files and add target simulationruntimecmsvc to Makefil…

…e.omdev.mingw to call cmake to generate msvc libs (does not yet work because camke does not configue nmake files) git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13514 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 19, 2012 · cb3e316 · cb3e316
1 parent 82ffe89
commit cb3e316
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 37 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,27 +25,23 @@ ADD_SUBDIRECTORY(testsuite)
 ENDIF(RUN_TESTS)
 
 # Subdirectorys
-#ADD_SUBDIRECTORY(c_runtime)
 #ADD_SUBDIRECTORY(modelica_parser)
 #ADD_SUBDIRECTORY(flat_modelica_parser)
 #ADD_SUBDIRECTORY(Compiler)
 #ADD_SUBDIRECTORY(doc)
 #ADD_SUBDIRECTORY(Examples)
 ADD_SUBDIRECTORY(SimulationRuntime)
-ADD_SUBDIRECTORY(3rdParty/FMIL/ThirdParty/Expat/expat-2.0.1)
+#ADD_SUBDIRECTORY(3rdParty/FMIL/ThirdParty/Expat/expat-2.0.1)
 
+IF(RUN_TESTS)
 # -------------------------------------------------------------
 # Models
 # -------------------------------------------------------------
 # add here your models to compile (add filename without ".mo")
 # Example:
 #    BUILDMODEL(model dir Flags CSRC)
 #BUILDMODEL(BouncingBall ${CMAKE_CURRENT_SOURCE_DIR}/testsuite/mosfiles-dassl +d=bltdump "")
-#BUILDMODEL(Test ${CMAKE_CURRENT_SOURCE_DIR}/build/bin/Test +d=dumpdaelow)
-#BUILDMODEL(WheelLoader_der_state ${CMAKE_CURRENT_SOURCE_DIR}/build/bin/Test +d=bltdump "")
 #BUILDMODELFMU(Test ${CMAKE_CURRENT_SOURCE_DIR}/build/bin/Test/FMU +d=bltdump "")
-#BUILDMODEL(Test1 ${CMAKE_CURRENT_SOURCE_DIR}/build/bin/Test/FMU +d=bltdump "")
-#BUILDMODEL(CombiTable2DTest CombiTable2DTest.mo ${OMCTRUNCHOME}/build/bin/Test +d= "")
-BUILDMODELMOS(BouncingBall BouncingBall.mos ${CMAKE_CURRENT_SOURCE_DIR}/testsuite/mosfiles  +simCodeTarget=C "")
+#BUILDMODELMOS(PolyEvaluate2 PolynomialEvaluatorB.mos ${CMAKE_CURRENT_SOURCE_DIR}/testsuite/simulation/modelica/arrays  +simCodeTarget=C "")
 #BUILDMODELFMUMOS(WheelLoader D:/Temp/Modell/Radlader-CNH/WheelLoader.mos +d=bltdump "")
-#BUILDMODELFMUMOS(Weidemann_CX60_Sarturis D:/Programming/Models/Radlader_Hexapod/FMU/fmu.mos +d=bltdump "")
+ENDIF(RUN_TESTS)
diff --git a/Makefile.common b/Makefile.common
@@ -190,6 +190,7 @@ clean: qtclean fmil-clean opencl_rt_clean
 	(cd PythonInterface && $(MAKE) -f $(defaultMakefileTarget) clean)
 	$(MAKE) -C 3rdParty/modelica3d/build clean || true
 	(rm -rf 3rdParty/modelica3d/build)
+	(rm -rf SimulationRuntime/build_c)
 	rm -rf build/share build/lib build/include build/bin/OMShell* build/bin/OMNotebook* \
 	build/bin/omc build/bin/omc.exe build/bin/omc-diff build/bin/omc-diff.exe \
 	bom-error.log bom-error.sh tab-error.log

diff --git a/SimulationRuntime/c/CMakeLists.txt b/SimulationRuntime/c/CMakeLists.txt
@@ -1,7 +1,16 @@
 # Jens Frenkel, Jens.Frenkel@tu-dresden.de, 2011-10-11
 # CMakefile for compilation of OMC 
 
+# CMAKE
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
+# PROJECT
+PROJECT(SimulationRuntimeC)
+
+# Global Variables
+IF(NOT OMCTRUNCHOME)
+  SET(OMCTRUNCHOME ${CMAKE_CURRENT_SOURCE_DIR}/../../)
+ENDIF (NOT OMCTRUNCHOME)
 
 # OMDEV PATH
 IF(NOT OMDEV)
@@ -12,31 +21,53 @@ INCLUDE_DIRECTORIES(${OMDEV}/lib/expat-win32-msvc)
 link_directories(${OMDEV}/lib/expat-win32-msvc)
 
 # SUNDIALS Header
-FIND_PATH(SUNDIALS_INCLUDE_DIR sundials/sundials_config.h /usr/include /usr/local/include $ENV{INCLUDE})
+FIND_PATH(SUNDIALS_INCLUDE_DIR sundials/sundials_config.h /usr/include /usr/local/include $ENV{INCLUDE} ${OMDEV}/lib/3rdParty/Sundials/include)
 
 # SUNDIALS Libraires
-FIND_LIBRARY(SUNDIALS_LIBRARY_CVODE      NAMES sundials_cvode      PATHS /usr/lib /usr/local/lib $ENV{LIB})
-FIND_LIBRARY(SUNDIALS_LIBRARY_IDA        NAMES sundials_ida        PATHS /usr/lib /usr/local/lib $ENV{LIB})
-FIND_LIBRARY(SUNDIALS_LIBRARY_NVEC       NAMES sundials_nvecserial        PATHS /usr/lib /usr/local/lib $ENV{LIB})
-FIND_LIBRARY(SUNDIALS_KINSOL       NAMES sundials_kinsol        PATHS /usr/lib /usr/local/lib $ENV{LIB})
+FIND_LIBRARY(SUNDIALS_LIBRARY_CVODE      NAMES sundials_cvode      PATHS /usr/lib /usr/local/lib $ENV{LIB} ${OMDEV}/lib/3rdParty/Sundials/lib/release/vc100)
+FIND_LIBRARY(SUNDIALS_LIBRARY_IDA        NAMES sundials_ida        PATHS /usr/lib /usr/local/lib $ENV{LIB} ${OMDEV}/lib/3rdParty/Sundials/lib/release/vc100)
+FIND_LIBRARY(SUNDIALS_LIBRARY_NVEC       NAMES sundials_nvecserial        PATHS /usr/lib /usr/local/lib $ENV{LIB} ${OMDEV}/lib/3rdParty/Sundials/lib/release/vc100)
+FIND_LIBRARY(SUNDIALS_KINSOL       NAMES sundials_kinsol        PATHS /usr/lib /usr/local/lib $ENV{LIB} ${OMDEV}/lib/3rdParty/Sundials/lib/release/vc100)
 
-IF(SUNDIALS_INCLUDE_DIR AND
-   SUNDIALS_LIBRARY_CVODE AND
+FIND_LIBRARY(SUNDIALS_LIBRARY_CVODED      NAMES sundials_cvoded      PATHS /usr/lib /usr/local/lib $ENV{LIB} ${OMDEV}/lib/3rdParty/Sundials/lib/debug/vc100)
+FIND_LIBRARY(SUNDIALS_LIBRARY_IDAD        NAMES sundials_idad        PATHS /usr/lib /usr/local/lib $ENV{LIB} ${OMDEV}/lib/3rdParty/Sundials/lib/debug/vc100)
+FIND_LIBRARY(SUNDIALS_LIBRARY_NVECD       NAMES sundials_nvecseriald        PATHS /usr/lib /usr/local/lib $ENV{LIB} ${OMDEV}/lib/3rdParty/Sundials/lib/debug/vc100)
+FIND_LIBRARY(SUNDIALS_KINSOLD       NAMES sundials_kinsold        PATHS /usr/lib /usr/local/lib $ENV{LIB} ${OMDEV}/lib/3rdParty/Sundials/lib/debug/vc100)
+
+IF(SUNDIALS_INCLUDE_DIR)
+
+  INCLUDE_DIRECTORIES(${SUNDIALS_INCLUDE_DIR})
+
+  if (SUNDIALS_LIBRARY_CVODE AND
    SUNDIALS_LIBRARY_IDA AND
    SUNDIALS_LIBRARY_NVEC AND
    SUNDIALS_KINSOL)
 
-  INCLUDE_DIRECTORIES(${SUNDIALS_INCLUDE_DIR})
   SET(SUNDIALS_LIBRARIES ${SUNDIALS_LIBRARY_CVODE} ${SUNDIALS_LIBRARY_IDA} ${SUNDIALS_LIBRARY_NVEC} ${SUNDIALS_KINSOL}) 
 
-ENDIF(SUNDIALS_INCLUDE_DIR AND
-      SUNDIALS_LIBRARY_CVODE AND
+ENDIF(SUNDIALS_LIBRARY_CVODE AND
       SUNDIALS_LIBRARY_IDA AND
    SUNDIALS_LIBRARY_NVEC AND 
    SUNDIALS_KINSOL)
-
-# OMC Compiler
-MESSAGE(" omc is " ${OMC_DEBUG})
+
+  if (SUNDIALS_LIBRARY_CVODED AND
+   SUNDIALS_LIBRARY_IDAD AND
+   SUNDIALS_LIBRARY_NVECD AND
+   SUNDIALS_KINSOLD)
+
+  SET(SUNDIALS_DEBUG_LIBRARIES ${SUNDIALS_LIBRARY_CVODED} ${SUNDIALS_LIBRARY_IDAD} ${SUNDIALS_LIBRARY_NVECD} ${SUNDIALS_KINSOLD}) 
+
+ENDIF(SUNDIALS_LIBRARY_CVODED AND
+      SUNDIALS_LIBRARY_IDAD AND
+   SUNDIALS_LIBRARY_NVECD AND 
+   SUNDIALS_KINSOLD)   
+
+ENDIF(SUNDIALS_INCLUDE_DIR)
+
+# Defines for Visual Studio
+if(MSVC)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -D_COMPLEX_DEFINED)
+endif(MSVC)	
 
 # includes
 INCLUDE_DIRECTORIES(${OMCTRUNCHOME})

diff --git a/SimulationRuntime/c/ModelicaExternalC/CMakeLists.txt b/SimulationRuntime/c/ModelicaExternalC/CMakeLists.txt
@@ -15,6 +15,6 @@ add_library(ModelicaExternalC  ${ModelicaExternalC_sources} ${ModelicaExternalC_
 
 # Install
 INSTALL(TARGETS ModelicaExternalC
-		ARCHIVE DESTINATION lib)
-INSTALL(FILES ${ModelicaExternalC_headers} DESTINATION include)
+		ARCHIVE DESTINATION lib/omc)
+#INSTALL(FILES ${ModelicaExternalC_headers} DESTINATION include)
 
diff --git a/SimulationRuntime/c/math-support/CMakeLists.txt b/SimulationRuntime/c/math-support/CMakeLists.txt
@@ -16,7 +16,7 @@ ADD_LIBRARY(math-support ${math_support_sources} ${math_support_headers})
 
 # Install
 INSTALL(TARGETS math-support
-		ARCHIVE DESTINATION lib)
+		ARCHIVE DESTINATION lib/omc)
 
-INSTALL(FILES ${math_support_headers} DESTINATION include)
+#INSTALL(FILES ${math_support_headers} DESTINATION include)
 
diff --git a/SimulationRuntime/c/meta/CMakeLists.txt b/SimulationRuntime/c/meta/CMakeLists.txt
@@ -30,6 +30,6 @@ add_library(meta  ${META_SRC} ${META_HFILES})
 
 # Install
 INSTALL(TARGETS meta
-		ARCHIVE DESTINATION lib)
-INSTALL(FILES ${META_HFILES} DESTINATION include/meta)
+		ARCHIVE DESTINATION lib/omc)
+#INSTALL(FILES ${META_HFILES} DESTINATION include/meta)
 
diff --git a/SimulationRuntime/c/simulation/CMakeLists.txt b/SimulationRuntime/c/simulation/CMakeLists.txt
@@ -23,6 +23,6 @@ ADD_LIBRARY(simulation ${simulation_sources} ${simulation_headers})
 
 # Install
 INSTALL(TARGETS simulation
-		ARCHIVE DESTINATION lib)
+		ARCHIVE DESTINATION lib/omc)
 
-INSTALL(FILES ${simulation_headers} DESTINATION include)
+#INSTALL(FILES ${simulation_headers} DESTINATION include)
diff --git a/SimulationRuntime/c/simulation/results/CMakeLists.txt b/SimulationRuntime/c/simulation/results/CMakeLists.txt
@@ -15,7 +15,7 @@ ADD_LIBRARY(results ${results_sources} ${results_headers})
 
 # Install
 INSTALL(TARGETS results
-		ARCHIVE DESTINATION lib)
+		ARCHIVE DESTINATION lib/omc)
 
-INSTALL(FILES ${results_headers} DESTINATION include)
+#INSTALL(FILES ${results_headers} DESTINATION include)
 
diff --git a/SimulationRuntime/c/simulation/solver/CMakeLists.txt b/SimulationRuntime/c/simulation/solver/CMakeLists.txt
@@ -27,7 +27,7 @@ ADD_LIBRARY(solver ${solver_sources} ${solver_headers})
 
 # Install
 INSTALL(TARGETS solver
-		ARCHIVE DESTINATION lib)
+		ARCHIVE DESTINATION lib/omc)
 
-INSTALL(FILES ${solver_headers} DESTINATION include)
+#INSTALL(FILES ${solver_headers} DESTINATION include)
 
diff --git a/SimulationRuntime/c/simulation/solver/initialization/CMakeLists.txt b/SimulationRuntime/c/simulation/solver/initialization/CMakeLists.txt
@@ -24,7 +24,7 @@ ADD_LIBRARY(initialization ${initialization_sources} ${initialization_headers})
 
 # Install
 INSTALL(TARGETS initialization
-		ARCHIVE DESTINATION lib)
+		ARCHIVE DESTINATION lib/omc)
 
-INSTALL(FILES ${initialization_headers} DESTINATION include)
+#INSTALL(FILES ${initialization_headers} DESTINATION include)
 
diff --git a/SimulationRuntime/c/util/CMakeLists.txt b/SimulationRuntime/c/util/CMakeLists.txt
@@ -15,6 +15,6 @@ ADD_LIBRARY(util ${util_sources} ${util_headers})
 
 # Install
 INSTALL(TARGETS util
-		ARCHIVE DESTINATION lib)
+		ARCHIVE DESTINATION lib/omc)
 
-INSTALL(FILES ${util_headers} DESTINATION include)
+#INSTALL(FILES ${util_headers} DESTINATION include)