Changeset 66a59d6d in OpenModelica

Timestamp:

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

Author:

Mahder Gebremedhin <mahder.gebremedhin@…>

Children:

610c20cc

Parents:

86e2a29f

git-author:

Mahder Gebremedhin <mahder.gebremedhin@…> (09/10/20 14:19:28)

git-committer:

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

Message:

[cmake] Corba support for omniORB on MinGW/OMdev.

• Corba support for MinGW/OMDev is enabled by the variable OMC_USE_CORBA

• The file omdev_omniorb_setup.cmake sets up the omniORB libraries and idl compiler for use with CMake.

• The file omc_omniorb_corba_target.cmake provided a macro for conveniently adding corba targets.

Location:

OMCompiler

Files:

• CMakeLists.txt (modified) (1 diff)
• Compiler/runtime/.cmake/omc_omniorb_corba_target.cmake (added)
• Compiler/runtime/.cmake/omdev_omniorb_setup.cmake (added)
• Compiler/runtime/CMakeLists.txt (modified) (5 diffs)
• Compiler/runtime/Corba_omc.cpp (modified) (1 diff)

OMCompiler/CMakeLists.txt

@@ -19 +19 @@
 omc_add_to_report(CMAKE_BUILD_TYPE)
 
+
+# options
+option(OMC_USE_CORBA "Should use corba." ON)
+
+
 omc_add_subdirectory(3rdParty)
 omc_add_subdirectory(SimulationRuntime)

OMCompiler/Compiler/runtime/CMakeLists.txt

@@ -4 +4 @@
 find_package(Iconv REQUIRED)
 find_package(BLAS REQUIRED)
-# find_package(ZLIB REQUIRED) # We use the minizip lib from 3rdParty/FMIL
+# find_package(ZLIB REQUIRED) # Not needed. We use the minizip lib from 3rdParty/FMIL instead
+
+
+# make a directory specifically for generated files. If we are asked
+# for corba support we will generate some files here.
+set (GENERATED_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated)
+file(MAKE_DIRECTORY ${GENERATED_DIRECTORY})
+
 
 set(OMC_RUNTIIME_SOURCES Error_omc.cpp Print_omc.c ErrorMessage.cpp
@@ -15 +22 @@
                             systemimplmisc.cpp
                             )
+
+
+if(OMC_USE_CORBA AND MINGW)
+    # setup omniORB for MinGW OMDev
+    include(.cmake/omdev_omniorb_setup.cmake)
+
+    # Include the macro for compiling corba targets.
+    include(.cmake/omc_omniorb_corba_target.cmake)
+
+    # add a corba target for omc_communication.idl. The outputs will be put in the
+    # generated files directory.
+    omc_add_omniorb_corba_target(${OMNIIDL_EXE} ${CMAKE_CURRENT_SOURCE_DIR}/omc_communication.idl ${GENERATED_DIRECTORY})
+
+    set(OMC_RUNTIME_CORBA_SOURCES ${GENERATED_DIRECTORY}/omc_communication.cc omc_communication_impl.cpp Corba_omc.cpp)
+    set(OMC_RUNTIIME_SOURCES ${OMC_RUNTIIME_SOURCES} ${OMC_RUNTIME_CORBA_SOURCES})
+endif(OMC_USE_CORBA AND MINGW)
+
+
 
 add_library(omcruntime STATIC ${OMC_RUNTIIME_SOURCES})
@@ -29 +54 @@
 target_link_libraries(omcruntime PUBLIC omc::3rd::FMIL::minizip) # We use the minizip lib from 3rdParty/FMIL
 # target_link_libraries(omcruntime PUBLIC omc::3rd::gc)
+
+if(OMC_USE_CORBA AND MINGW)
+    target_link_libraries(omcruntime PUBLIC omdev::omniORB::omniORB420_rt)
+    target_link_libraries(omcruntime PUBLIC omdev::omniORB::omnithread40_rt)
+    target_compile_definitions(omcruntime PRIVATE USE_CORBA)
+    target_include_directories(omcruntime PRIVATE ${GENERATED_DIRECTORY})
+endif(OMC_USE_CORBA AND MINGW)
+
 
 target_include_directories(omcruntime INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
@@ -45 +78 @@
 
 target_link_libraries(omcbackendruntime PUBLIC OpenModelicaRuntimeC)
-target_link_libraries(omcbackendruntime PUBLIC omc::3rd::fmilib::shared) # We use the minizip lib from 3rdParty/FMIL
+target_link_libraries(omcbackendruntime PUBLIC omc::3rd::fmilib::shared)
 target_link_libraries(omcbackendruntime PUBLIC omc::3rd::gc)
+target_link_libraries(omcbackendruntime PUBLIC omc::3rd::metis)
 
 target_include_directories(omcbackendruntime INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
@@ -59 +93 @@
 add_library(omc::compiler::graphstream ALIAS omcgraphstream)
 
-target_link_libraries(omcbackendruntime PUBLIC omc::3rd::metis)
 target_link_libraries(omcgraphstream PUBLIC OpenModelicaRuntimeC)
 target_link_libraries(omcgraphstream PUBLIC omc::3rd::netstream)

OMCompiler/Compiler/runtime/Corba_omc.cpp

@@ -34 +34 @@
 extern "C" {
 
-#include "meta_modelica.h"
+#include "meta/meta_modelica.h"
 #include "ModelicaUtilities.h"