Changeset d632ee4a in OpenModelica

Timestamp:

2022-05-17T16:19:19+02:00 (2 years ago)

Author:

GitHub <noreply@…>

Branches:

maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master

Children:

4a24650, f18a4b21

Parents:

d1015711

git-author:

Mahder Gebremedhin <mahge@…> (05/17/22 16:19:19)

git-committer:

GitHub <noreply@…> (05/17/22 16:19:19)

Message:

Minor fixes for ModelicaExternalC and CPP runtime builds. (#8972)

• ModelicaExternalC stand alone CMake build:
  • Link to libm only on Unix.
  • Export all symbols with MSVC. This is not needed right now as the stand alone build is only meant to be used for the Autoconf build system. The CMake build system has another (not the standalone) CMake file that it uses that is integrated in to the whole OpenModelica build.

• CPP runtime
  • Fix the install directory for CPP runtime shared libs. They want to be in the lib folder even on Windows (instead of the bin dir). The should be fixed from the other side and the libraries should be added into the bin dir together with the other DLLs OpenModelica builds.

• Remove unnecessary manually set LPACK libraries string. It is not needed.

Location:

OMCompiler/SimulationRuntime

Files:

• ModelicaExternalC/MEC_standalone_2.8.cmake (modified) (7 diffs)
• cpp/Core/CMakeLists.txt (modified) (1 diff)
• cpp/cmake_3.14.cmake (modified) (1 diff)

OMCompiler/SimulationRuntime/ModelicaExternalC/MEC_standalone_2.8.cmake

@@ -14 +14 @@
 link_directories(${CMAKE_INSTALL_LIBDIR} ${CMAKE_INSTALL_BINDIR})
 
-# Set the rpath to the same dir as the destination of the libs
-# when installing. This should be enough since the dependencies
-# (libOpenModelicaRuntimeC and libomcgc) should end up in the same
-# dir as well (lib/<arch>/omc/ on linux or bin/ on Windows).
-set(CMAKE_INSTALL_RPATH $ORIGIN)
+# Set the rpath to the one dir up as the destination of the libs
+# when installing is an 'ffi' directory in the lib directory.
+# See the install commnad at the end of this file. If that is
+# changed make sure to adjust this as well.
+if(APPLE)
+  set(CMAKE_INSTALL_RPATH "@loader_path/../../${CMAKE_INSTALL_LIBDIR}")
+else()
+  set(CMAKE_INSTALL_RPATH "$ORIGIN;$ORIGIN/../../${CMAKE_INSTALL_LIBDIR}")
+endif()
 
 ## ModelicaExternalC #########################################################################
@@ -30 +34 @@
 add_library(omc::simrt::Modelica::ExternalC ALIAS ModelicaExternalC)
 
-target_link_libraries(ModelicaExternalC PUBLIC m)
+if(UNIX)
+  target_link_libraries(ModelicaExternalC PUBLIC m)
+endif()
+
 target_link_libraries(ModelicaExternalC PUBLIC OpenModelicaRuntimeC)
 target_link_libraries(ModelicaExternalC PUBLIC omcgc)
@@ -40 +47 @@
                       PROPERTIES OUTPUT_NAME ModelicaExternalC CLEAN_DIRECT_OUTPUT 1)
 
-target_link_libraries(ModelicaExternalC_shared PUBLIC m)
+if(UNIX)
+  target_link_libraries(ModelicaExternalC_shared PUBLIC m)
+endif()
+
 target_link_libraries(ModelicaExternalC_shared PUBLIC OpenModelicaRuntimeC)
 target_link_libraries(ModelicaExternalC_shared PUBLIC omcgc)
 
-if(WIN32)
+if(MINGW)
   set_target_properties(ModelicaExternalC_shared PROPERTIES LINK_FLAGS "-Wl,--export-all-symbols")
+elseif(MSVC)
+  set_target_properties(ModelicaExternalC_shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS true)
 endif()
 
@@ -71 +83 @@
 target_link_libraries(ModelicaMatIO_shared PUBLIC OpenModelicaRuntimeC)
 target_link_libraries(ModelicaMatIO_shared PUBLIC omcgc)
-if(WIN32)
+
+if(MINGW)
   set_target_properties(ModelicaMatIO_shared PROPERTIES LINK_FLAGS "-Wl,--export-all-symbols")
+elseif(MSVC)
+  set_target_properties(ModelicaMatIO_shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS true)
 endif()
 
@@ -91 +106 @@
 
 target_link_libraries(ModelicaIO_shared PUBLIC ModelicaMatIO_shared)
-if(WIN32)
+if(MINGW)
   set_target_properties(ModelicaIO_shared PROPERTIES LINK_FLAGS "-Wl,--export-all-symbols")
+elseif(MSVC)
+  set_target_properties(ModelicaIO_shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS true)
 endif()
 
@@ -108 +125 @@
 
 target_link_libraries(ModelicaStandardTables PUBLIC ModelicaIO)
-target_link_libraries(ModelicaStandardTables PUBLIC m)
+if(UNIX)
+  target_link_libraries(ModelicaStandardTables PUBLIC m)
+endif()
 
 # Shared version
@@ -120 +139 @@
 
 target_link_libraries(ModelicaStandardTables_shared PUBLIC ModelicaIO_shared)
-target_link_libraries(ModelicaStandardTables_shared PUBLIC m)
-if(WIN32)
+if(UNIX)
+  target_link_libraries(ModelicaStandardTables_shared PUBLIC m)
+endif()
+
+if(MINGW)
   set_target_properties(ModelicaStandardTables_shared PROPERTIES LINK_FLAGS "-Wl,--export-all-symbols")
+elseif(MSVC)
+  set_target_properties(ModelicaStandardTables_shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS true)
 endif()
 

OMCompiler/SimulationRuntime/cpp/Core/CMakeLists.txt

@@ -8 +8 @@
 set(Boost_LIBS_ ".")
 set(LAPACK_LIBS_ ".")
-set(LAPACK_LIBRARIES_ "-llapack -lblas")
+set(LAPACK_LIBRARIES_ "")
 set(SYSTEM_CFLAGS ${SYSTEM_CFLAGS} "-DOMC_BUILD -fPIC -DUSE_THREAD")
 

OMCompiler/SimulationRuntime/cpp/cmake_3.14.cmake

@@ -6 +6 @@
 # CPP libs should be installed to in lib/<arch>/omc/cpp/ for now.
 set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}/cpp)
+set(CMAKE_INSTALL_BINDIR ${CMAKE_INSTALL_LIBDIR})
 # CPP headers are installed in include/omc/cpp for now.
 set(CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/cpp)