Changeset b9156e9 in OpenModelica for OMCompiler/Parser/CMakeLists.txt

Timestamp:

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

Author:

Mahder Gebremedhin <mahder.gebremedhin@…>

Children:

28fb3e1

Parents:

a44b408

git-author:

Mahder Gebremedhin <mahder.gebremedhin@…> (07/12/20 20:34:30)

git-committer:

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

Message:

[cmake] Add CMake support for OMCompiler/runtime.

• OMCompiler/runtime cannow be compiled using cmake.
  • Right now there is missing symbols from dgsev. I am not sure yet where to add them. Maybe dgsev can be added to simulationRuntime/c libraries. Other than that OMCompiler/runtime can be compiled with all symbols found at the moment.

• We now use proper qualified names for libraries, e.g. omc::3rd::gc for the gc-lib in 3rdParty/gc. These names are added as aliases to the actual library. Use these everywhere. There should not be a single use of the actual library names.

File:

• OMCompiler/Parser/CMakeLists.txt (modified) (3 diffs)

OMCompiler/Parser/CMakeLists.txt

@@ -4 +4 @@
 
 find_package(Java REQUIRED Runtime)
-omc_add_to_report(Java_JAVA_EXECUTABLE)
+# omc_add_to_report(Java_JAVA_EXECUTABLE)
+find_package(Intl REQUIRED)
 
 
@@ -32 +33 @@
 
 ######################### add libomparser ###########################
-add_library(omparse SHARED ${OM_PARSE_SOURCES})
-target_link_libraries(omparse PUBLIC omantlr3)
+add_library(omparse STATIC ${OM_PARSE_SOURCES})
+target_link_libraries(omparse PUBLIC Intl)
+target_link_libraries(omparse PUBLIC omc::compiler::runtime)
+target_link_libraries(omparse PUBLIC omc::3rd::omantlr3)
 target_link_libraries(omparse PUBLIC OpenModelicaRuntimeC)
 
-# # to find the generated antlr headers
-# # SYSTEM to disable warnings on the generated code.
-# target_include_directories(omparse SYSTEM PRIVATE ${GNERATED_DIRECTORY})
+
 target_include_directories(omparse PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -50 +51 @@
 ######################### add libomparser-boot ###########################
 add_library(omparse-boot STATIC ${OM_PARSE_SOURCES})
-target_link_libraries(omparse-boot PUBLIC omantlr3)
+target_link_libraries(omparse-boot PUBLIC Intl)
+target_link_libraries(omparse-boot PUBLIC omc::compiler::runtime)
+target_link_libraries(omparse-boot PUBLIC omc::3rd::omantlr3)
 target_link_libraries(omparse-boot PUBLIC OpenModelicaRuntimeC)