Changeset 780c1e84 in OpenModelica

Timestamp:

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

Author:

Mahder Gebremedhin <mahder.gebremedhin@…>

Children:

965cc7b7

Parents:

76fcdf3

git-author:

Mahder Gebremedhin <mahder.gebremedhin@…> (09/16/20 14:48:08)

git-committer:

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

Message:

[cmake] Make corba actually optional.

• There was an option to disable corba already. However, compilation was just supposed to fail if there was no corba support. Now it is fixed.

• Corba support is now disabled by default. -> OMC_USE_CORBA is OFF by default.

Location:

OMCompiler

Files:

• CMakeLists.txt (modified) (1 diff)
• Compiler/runtime/CMakeLists.txt (modified) (1 diff)

OMCompiler/CMakeLists.txt

@@ -21 +21 @@
 
 # options
-option(OMC_USE_CORBA "Should use corba." ON)
+option(OMC_USE_CORBA "Should use corba." OFF)
+omc_add_to_report(OMC_USE_CORBA)
 
 

OMCompiler/Compiler/runtime/CMakeLists.txt

@@ -24 +24 @@
 
 
-if(OMC_USE_CORBA AND MINGW)
+if(OMC_USE_CORBA)
+  if(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})
+    # add corba sources to source files list.
+    set(OMC_RUNTIIME_SOURCES ${OMC_RUNTIIME_SOURCES} ${GENERATED_DIRECTORY}/omc_communication.cc omc_communication_impl.cpp Corba_omc.cpp)
+  else(MINGW) # Not MinGW
+    message(FATAL "Corba support for non-MinGW omc builds is not yet implemented.")
+    # set(OMC_RUNTIIME_SOURCES ${OMC_RUNTIIME_SOURCES} ${GENERATED_DIRECTORY}/omc_communication.cc omc_communication_impl.cpp Corba_omc.cpp)
+  endif(MINGW)
 
-    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)
+else(OMC_USE_CORBA) # No corba support requested.
+    set(OMC_RUNTIIME_SOURCES ${OMC_RUNTIIME_SOURCES} corbaimpl_stub_omc.o)
+endif(OMC_USE_CORBA)
+
+
+