Changeset 57178daf in OpenModelica

Timestamp:

2022-05-19T13:52:34+02:00 (2 years ago)

Author:

Mahder Gebremedhin <mahder.geb@…>

Parents:

ffc3407d

git-author:

Mahder Gebremedhin <mahder.geb@…> (05/19/22 13:33:24)

git-committer:

Mahder Gebremedhin <mahder.geb@…> (05/19/22 13:52:34)

Message:

Minor fixes.

• Link wsock32 to libSimulationRuntimeC instead of libOpenModelicaRuntimeC. It is not needed by the latter.

• If on linux, assume lapack libraries are "-llapack -lblas" for CPP runtime. This needs proper portable fix but it will be done later. Removal of it caused some regressions on the CMake based testsuite test.

Location:

OMCompiler/SimulationRuntime

Files:

• c/cmake_3.14.cmake (modified) (2 diffs)
• cpp/Core/CMakeLists.txt (modified) (1 diff)

OMCompiler/SimulationRuntime/c/cmake_3.14.cmake

@@ -50 +50 @@
   target_link_libraries(OpenModelicaRuntimeC PUBLIC dbghelp)
   target_link_libraries(OpenModelicaRuntimeC PUBLIC regex)
-  target_link_libraries(OpenModelicaRuntimeC PUBLIC wsock32)
   target_link_options(OpenModelicaRuntimeC PRIVATE  -Wl,--export-all-symbols)
 elseif(MSVC)
@@ -88 +87 @@
 target_link_libraries(SimulationRuntimeC PUBLIC ${LAPACK_LIBRARIES})
 
+if(WIN32)
+  target_link_libraries(SimulationRuntimeC PUBLIC wsock32)
+endif()
+
 if(MINGW)
   target_link_options(SimulationRuntimeC PRIVATE  -Wl,--export-all-symbols)
 elseif(MSVC)
-  target_link_libraries(SimulationRuntimeC PUBLIC wsock32)
   set_target_properties(SimulationRuntimeC PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS true)
 endif(MINGW)

OMCompiler/SimulationRuntime/cpp/Core/CMakeLists.txt

@@ -8 +8 @@
 set(Boost_LIBS_ ".")
 set(LAPACK_LIBS_ ".")
-set(LAPACK_LIBRARIES_ "")
 set(SYSTEM_CFLAGS ${SYSTEM_CFLAGS} "-DOMC_BUILD -fPIC -DUSE_THREAD")
+if(UNIX)
+  set(LAPACK_LIBRARIES_ "-llapack -lblas")
+else()
+  set(LAPACK_LIBRARIES_ "")
+endif()
 
 configure_file(Modelica/ModelicaLibraryConfig_gcc.inc.in ${CMAKE_CURRENT_BINARY_DIR}/ModelicaLibraryConfig_gcc.inc)