Changeset 662060f4 in OpenModelica

Timestamp:

2020-10-21T14:04:16+02:00 (4 years ago)

Author:

Mahder Gebremedhin <mahder.gebremedhin@…>

Children:

0846120c

Parents:

f922c1f

git-author:

Mahder Gebremedhin <mahder.gebremedhin@…> (09/07/20 18:03:20)

git-committer:

Mahder Gebremedhin <mahder.gebremedhin@…> (10/21/20 14:04:16)

Message:

[cmake] Selectively include old/new cmake source.

• The CMakeLists.txt in SimulationRuntime/c is actually used for compilation of simulationruntimemsvc library. Therefor we need to keep it for now.

To do this we include one of the old or new cmake sources in the
main CMakelists.tx file in c/ folder based on a variable that is
either defined or undefined depening on which compilation
(new cmake or makefile.omdev.mingw) is used.

Location:

OMCompiler

Files:

• CMakeLists.txt (modified) (1 diff)
• SimulationRuntime/c/CMakeLists.txt (modified) (1 diff)
• SimulationRuntime/c/cmake_2.8.cmake (added)
• SimulationRuntime/c/cmake_3.14.cmake (added)

OMCompiler/CMakeLists.txt

@@ -1 +1 @@
 cmake_minimum_required(VERSION 3.14)
 project(OMCompiler)
+
+# We use this to selectively include some cmake source files
+# e.g. simulationRuntime/c/ has two cmake sources that are conditionally
+# included. The old (cmake 2.8) cmake source in there is used for compilation
+# of simulationruntimemsvc by the Makefile.omdev.mingw makefiles.
+set(OPENMODELICA_NEW_CMAKE_BUILD ON)
 
 # set(CMAKE_VERBOSE_MAKEFILE ON)

OMCompiler/SimulationRuntime/c/CMakeLists.txt

@@ -1 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 2.6)
 
-project(SimulationRuntimeC)
-
-
-file(GLOB OMC_SIMRT_UTIL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/util/*.c)
-file(GLOB OMC_SIMRT_UTIL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/util/*.h)
-
-file(GLOB OMC_SIMRT_META_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/meta/*.c)
-file(GLOB OMC_SIMRT_META_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/meta/*.h)
-
-file(GLOB OMC_SIMRT_GC_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/gc/*.c)
-file(GLOB OMC_SIMRT_GC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/gc/*.h)
-
-file(GLOB OMC_SIMRT_FMI_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/fmi/*.c)
-file(GLOB OMC_SIMRT_FMI_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/fmi/*.h)
-
-
-set(libOpenModelicaRuntimeC_BUILD_TYPE STATIC CACHE STRING "Type of OpenModelicaRuntimeC to build")
-omc_add_to_report(libOpenModelicaRuntimeC_BUILD_TYPE)
-
-add_library(OpenModelicaRuntimeC ${libOpenModelicaRuntimeC_BUILD_TYPE}
-                                    ${OMC_SIMRT_UTIL_SOURCES}
-                                    ${OMC_SIMRT_META_SOURCES}
-                                    ${OMC_SIMRT_GC_SOURCES})
-target_link_libraries(OpenModelicaRuntimeC PUBLIC omc::3rd::gc regex dbghelp)
-target_compile_options(OpenModelicaRuntimeC PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Werror=implicit-function-declaration>)
-# target_link_libraries(OpenModelicaRuntimeC PUBLIC $<$<CXX_COMPILER_ID:gcc>:dbghelp>)
-
-target_include_directories(OpenModelicaRuntimeC INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
-
-
-
-set(libOpenModelicaFMIRuntimeC_BUILD_TYPE STATIC CACHE STRING "Type of OpenModelicaFMIRuntimeC to build" FORCE)
-omc_add_to_report(libOpenModelicaFMIRuntimeC_BUILD_TYPE)
-
-add_library(OpenModelicaFMIRuntimeC ${libOpenModelicaFMIRuntimeC_BUILD_TYPE}
-                                    ${OMC_SIMRT_FMI_SOURCES})
-
-
-target_link_libraries(OpenModelicaFMIRuntimeC PUBLIC omc::3rd::fmilib::shared)
-target_link_libraries(OpenModelicaFMIRuntimeC PUBLIC OpenModelicaRuntimeC)
-target_compile_options(OpenModelicaFMIRuntimeC PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Werror=implicit-function-declaration>)
-
+# if OPENMODELICA_NEW_CMAKE_BUILD is defined (in OMCompiler/CMakeLists.txt)
+# then we pick up the new cmake source.
+# Otherwise we pick the old one which is needed for compilation of
+# simulationruntimemsvc and is called from the Makefile.omdev.mingw files
+if(OPENMODELICA_NEW_CMAKE_BUILD)
+  include(cmake_3.14.cmake)
+else(OPENMODELICA_NEW_CMAKE_BUILD)
+  include(cmake_2.8.cmake)
+endif(OPENMODELICA_NEW_CMAKE_BUILD)