- update CMakeLists files

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13196 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 5, 2012 · 40c0a57 · 40c0a57
1 parent 5c14805
commit 40c0a57
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,9 +6,16 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 # PROJECT
 PROJECT(OpenModelicaCompiler)
 
+# Defines for Visual Studio
+if(MSVC)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -D_COMPLEX_DEFINED)
+endif(MSVC)	
+
 # Global Variables
 SET(OMCTRUNCHOME ${CMAKE_CURRENT_SOURCE_DIR})
 SET(CODEGENDIR ${CMAKE_CURRENT_BINARY_DIR}/codegen)
+SET(OPENMODELICAHOME $ENV{OPENMODELICAHOME})
+SET(OMC_DEBUG ${OPENMODELICAHOME}/bin/omc.exe)
 
 # Tests
 OPTION(RUN_TESTS  "Run Tests"  OFF)
@@ -25,20 +32,20 @@ ENDIF(RUN_TESTS)
 #ADD_SUBDIRECTORY(doc)
 #ADD_SUBDIRECTORY(Examples)
 ADD_SUBDIRECTORY(SimulationRuntime)
+ADD_SUBDIRECTORY(3rdParty/FMIL/ThirdParty/Expat/expat-2.0.1)
 
 # -------------------------------------------------------------
 # Models
 # -------------------------------------------------------------
 # add here your models to compile (add filename without ".mo")
 # Example:
 #    BUILDMODEL(model dir Flags CSRC)
-SET(OMC_DEBUG ${OMCTRUNCHOME}/build/bin/omc.exe)
 #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 "")
+#BUILDMODEL(CombiTable2DTest CombiTable2DTest.mo ${OMCTRUNCHOME}/build/bin/Test +d= "")
+BUILDMODELMOS(BouncingBall BouncingBall.mos ${CMAKE_CURRENT_SOURCE_DIR}/testsuite/mosfiles  +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 "")
diff --git a/SimulationRuntime/c/CMakeLists.txt b/SimulationRuntime/c/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Jens Frenkel, Jens.Frenkel@tu-dresden.de, 2011-10-11
 # CMakefile for compilation of OMC 
 
+
+
 # OMDEV PATH
 IF(NOT OMDEV)
   SET(OMDEV $ENV{OMDEV})
@@ -9,8 +11,8 @@ ENDIF(NOT OMDEV)
 INCLUDE_DIRECTORIES(${OMDEV}/lib/expat-win32-msvc)
 link_directories(${OMDEV}/lib/expat-win32-msvc)
 
+
 # OMC Compiler
-SET(OMC_DEBUG ${OMCTRUNCHOME}/build/bin/omcd.exe)
 MESSAGE(" omc is " ${OMC_DEBUG})
 
 # includes
@@ -118,6 +120,12 @@ ENDMACRO(BUILDMODEL)
 # MACRO BUILDMODEL
 MACRO(BUILDMODELMOS model mos dir Flags CSRC)
 
+IF(WIN32)
+  SET(COPY copy)
+else(WIN32)
+  SET(COPY cp)
+endif(WIN32)
+
   # includes
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/linearization)
@@ -145,7 +153,7 @@ MACRO(BUILDMODELMOS model mos dir Flags CSRC)
   SET(expat_CODE   ${OMDEV}/lib/expat-win32-msvc/libexpat.dll)
   SET(expat_OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/libexpat.dll)
   ADD_CUSTOM_COMMAND(OUTPUT ${expat_OUTPUT}
-                     COMMAND cp ${expat_CODE} ${expat_OUTPUT}
+                     COMMAND ${COPY} ${expat_CODE} ${expat_OUTPUT}
                      WORKING_DIRECTORY ${dir}
                      COMMENT "copy file ${expat_CODE} to ${expat_OUTPUT}")
   # target fuer OM_OUTPUT
@@ -166,20 +174,22 @@ MACRO(BUILDMODELMOS model mos dir Flags CSRC)
   ADD_CUSTOM_COMMAND(OUTPUT ${OMC_OUTPUT}
                      COMMAND ${OMC_DEBUG} ${Flags} ${mos}
                      WORKING_DIRECTORY ${dir}
-                     COMMENT "Erzeuge Code fuer ${model} with ${OMC_DEBUG}")
+                     COMMENT "Generating code for ${model} with ${OMC_DEBUG}")
   # target fuer OM_OUTPUT
   ADD_CUSTOM_TARGET(${model}codegen ALL DEPENDS ${OMC_OUTPUT})
+
+  ADD_CUSTOM_TARGET(${model}codegencpp ALL DEPENDS ${OMC_OUTPUT})
 
-
-  ADD_DEFINITIONS(/TP ${dir}/${model}.c)
+  ADD_DEFINITIONS(/TP)
+  set_source_files_properties(${OMC_OUTPUT} PROPERTIES LANGUAGE CXX)
   ADD_EXECUTABLE(${model} ${OMC_OUTPUT} ${CSRC})
-  TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver f2c meta ModelicaExternalC libexpat)
+  TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver f2c ModelicaExternalC libexpat)
 
   # custom command to copy xml file
   SET(XML_CODE   ${dir}/${model}_init.xml)
   SET(XML_OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${model}_init.xml)
   ADD_CUSTOM_COMMAND(OUTPUT ${XML_OUTPUT}
-                     COMMAND cp ${XML_CODE} ${XML_OUTPUT}
+                     COMMAND ${COPY} ${XML_CODE} ${XML_OUTPUT}
                      WORKING_DIRECTORY ${dir}
                      COMMENT "copy file ${XML_CODE} to ${XML_OUTPUT}")
   # target fuer OM_OUTPUT

diff --git a/SimulationRuntime/c/math-support/CMakeLists.txt b/SimulationRuntime/c/math-support/CMakeLists.txt
@@ -2,12 +2,13 @@
 # CMakefile for compilation of OMC 
 
 # Quellen und Header
-SET(math_support_sources  bigden.c biglag.c delay.c dgesv_aux.c dogleg.c dpmpar.c
-				enorm.c fdjac1.c hybrd.c hybrd1.c hybrj.c initialization.c lsame.c
-				model_help.c nelmead.c newuoa.c newuob.c qform.c qrfac.c r1mpyq.c
-                r1updt.c trsapp.c update.c)
+SET(math_support_sources  bigden.c biglag.c dgesv_aux.c dogleg.c dpmpar.c 
+                          enorm.c fdjac1.c hybrd.c hybrd1.c hybrj.c lsame.c 
+						  nelmead.c newuoa.c newuob.c nonlinearSystem.c 
+						  nonlinearSolverHybrd.c qform.c  qrfac.c r1mpyq.c 
+						  r1updt.c trsapp.c update.c)
 
-SET(math_support_headers  blaswrap.h delay.h initialization.h matrix.h model_help.h) 
+SET(math_support_headers  blaswrap.h matrix.h nonlinearSolverHybrd.h nonlinearSystem.h) 
 
 # Library util
 ADD_LIBRARY(math-support ${math_support_sources} ${math_support_headers})

diff --git a/SimulationRuntime/c/simulation/CMakeLists.txt b/SimulationRuntime/c/simulation/CMakeLists.txt
@@ -6,6 +6,9 @@ ADD_SUBDIRECTORY(libf2c)
 ADD_SUBDIRECTORY(results)
 ADD_SUBDIRECTORY(solver)
 
+# Include Directory of expat
+INCLUDE_DIRECTORIES("${OMCTRUNCHOME}/3rdParty/FMIL/ThirdParty/Expat/expat-2.0.1/lib")
+
 # Quellen und Header
 SET(simulation_sources  options.cpp simulation_input_xml.cpp simulation_runtime.cpp
 					    ../linearization/linearize.cpp)