Changeset 87d58d47 in OpenModelica

Timestamp:

2022-01-21T23:38:21+01:00 (2 years ago)

Author:

GitHub <noreply@…>

Branches:

maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

5c10d4c, a91df6e

Parents:

5cb0f20

git-author:

Mahder Gebremedhin <mahge@…> (01/21/22 23:38:21)

git-committer:

GitHub <noreply@…> (01/21/22 23:38:21)

Message:

Fixes for FMU generation on Windows with CMake built omc (#8451)

• [cmake] Define CMINPACK_NO_DLL to libSimulationRuntimeFMI.

• It is a static library.

• Install fmi/export/buildproject/configure.ac on Win

• This is just following what the Makefiles do. I am not 100% sure why it is needed and how it is used.

If it is not installed on Windows, the FMU creation complains about
missing file and terminates.

Location:

OMCompiler/SimulationRuntime

Files:

• c/cmake/source_code_fmu_config.cmake (modified) (2 diffs)
• c/cmake_3.14.cmake (modified) (1 diff)
• fmi/export/buildproject/CMakeLists.txt (modified) (1 diff)

OMCompiler/SimulationRuntime/c/cmake/source_code_fmu_config.cmake

@@ -134 +134 @@
                                             ${3RD_CMINPACK_FMU_FILES})
 
-target_compile_definitions(SimulationRuntimeFMI PRIVATE "-DOMC_MINIMAL_RUNTIME=1 -DOMC_FMI_RUNTIME=1")
+target_compile_definitions(SimulationRuntimeFMI PRIVATE -DOMC_MINIMAL_RUNTIME=1 -DOMC_FMI_RUNTIME=1 -DCMINPACK_NO_DLL)
 
 install(TARGETS SimulationRuntimeFMI)
@@ -140 +140 @@
 
 # ######################################################################################################################
-# Library: SimulationRuntimeFMI
+# Library: OpenModelicaFMIRuntimeC
+
+file(GLOB OMC_SIMRT_FMI_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/fmi/*.c)
+file(GLOB OMC_SIMRT_FMI_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/fmi/*.h)
+
 add_library(OpenModelicaFMIRuntimeC STATIC)
 add_library(omc::simrt::fmiruntime ALIAS OpenModelicaFMIRuntimeC)

OMCompiler/SimulationRuntime/c/cmake_3.14.cmake

@@ -26 +26 @@
 file(GLOB_RECURSE OMC_SIMRT_OPTIMIZATION_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/optimization/*.c)
 file(GLOB_RECURSE OMC_SIMRT_OPTIMIZATION_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/optimization/*.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)
 
 

OMCompiler/SimulationRuntime/fmi/export/buildproject/CMakeLists.txt

@@ -3 +3 @@
 ## This is not tested very well. Will be updated as we go.
 
-if(NOT WIN32)
-execute_process(COMMAND autoconf
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  RESULT_VARIABLE AUTOCONF_FOR_FMU_EXIT_STATUS
-  OUTPUT_VARIABLE AUTOCONF_FOR_FMU_OUTPUT
-  ERROR_VARIABLE AUTOCONF_FOR_FMU_ERROR
-  #   OUTPUT_QUIET
-)
-
-if(AUTOCONF_FOR_FMU_EXIT_STATUS AND NOT AUTOCONF_FOR_FMU_EXIT_STATUS EQUAL 0)
-    message(STATUS ${AUTOCONF_FOR_FMU_EXIT_STATUS})
-    message(STATUS ${AUTOCONF_FOR_FMU_OUTPUT})
-    message(STATUS ${AUTOCONF_FOR_FMU_ERROR})
-    message(FATAL_ERROR "autoconf failed configuring for FMUS.")
-endif()
-
-install(FILES configure
+if(WIN32)
+  install(FILES configure.ac
         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/omc/runtime/c/fmi/buildproject ## This should not be omc/runtime/c/fmi but rather omc/fmi. It is inconsistent
 )
+else()
+  execute_process(COMMAND autoconf
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    RESULT_VARIABLE AUTOCONF_FOR_FMU_EXIT_STATUS
+    OUTPUT_VARIABLE AUTOCONF_FOR_FMU_OUTPUT
+    ERROR_VARIABLE AUTOCONF_FOR_FMU_ERROR
+    #   OUTPUT_QUIET
+  )
 
+  if(AUTOCONF_FOR_FMU_EXIT_STATUS AND NOT AUTOCONF_FOR_FMU_EXIT_STATUS EQUAL 0)
+      message(STATUS ${AUTOCONF_FOR_FMU_EXIT_STATUS})
+      message(STATUS ${AUTOCONF_FOR_FMU_OUTPUT})
+      message(STATUS ${AUTOCONF_FOR_FMU_ERROR})
+      message(FATAL_ERROR "autoconf failed configuring for FMUS.")
+  endif()
+
+  install(FILES configure
+          DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/omc/runtime/c/fmi/buildproject ## This should not be omc/runtime/c/fmi but rather omc/fmi. It is inconsistent
+  )
 endif()