Changeset a767f054 in OpenModelica
- Timestamp:
- 2021-12-14T10:52:45+01:00 (2 years ago)
- Branches:
- maintenance/v1.18
- Parents:
- 281cb6ec
- git-author:
- Adrian Pop <adrian.pop@…> (12/14/21 10:52:45)
- git-committer:
- GitHub <noreply@…> (12/14/21 10:52:45)
- Location:
- OMCompiler/SimulationRuntime
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
OMCompiler/SimulationRuntime/OMSICpp/CMakeLists.txt
refa7994 ra767f054 485 485 ADD_DEFINITIONS(-D_GLIBCXX_USE_CXX11_ABI=0) 486 486 ENDIF(FMU_TARGET AND NOT MSVC) 487 488 IF(WIN32) 489 SET(CPPTHREADS_LIBRARY) 490 SET(CPPTHREADS_LIBRARY_FLAG) 491 ELSE(WIN32) 492 find_package(Threads REQUIRED) 493 SET(CPPTHREADS_LIBRARY Threads::Threads) 494 SET(CPPTHREADS_LIBRARY_FLAG ${CMAKE_THREAD_LIBS_INIT}) 495 ENDIF(WIN32) 487 496 488 497 SET(Boost_LIBRARIES_TMP ${Boost_LIBRARIES_TMP} ${Boost_LIBRARIES}) -
OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/Modelica/CMakeLists.txt
rf1678de ra767f054 230 230 MESSAGE(STATUS "--BOOST_LIBS = ${Boost_LIBS_} " - " ${Boost_Library_folder}") 231 231 MESSAGE(STATUS "--BOOST_INCLUDE = ${Boost_INCLUDE_}") 232 MESSAGE(STATUS "--BOOST_LIBRARIES = ${Boost_LIBRARIES_} ")232 MESSAGE(STATUS "--BOOST_LIBRARIES = ${Boost_LIBRARIES_} ${CPPTHREADS_LIBRARY_}") 233 233 MESSAGE(STATUS "--SUNDIALS_LIBS = ${SUNDIALS_LIBS_}") 234 234 MESSAGE(STATUS "--SUNDIALS_INCLUDE = ${SUNDIALS_INCLUDE_DIR_}") … … 239 239 MESSAGE(STATUS "--UMFPACK_INCLUDE = ${UMFPACK_INCLUDE_}") 240 240 MESSAGE(STATUS "--UMFPACK_LIBRARIES = ${UMFPACK_LIBRARIES_}") 241 MESSAGE(STATUS "--CPPTHREADS_LIBRARY = ${CPPTHREADS_LIBRARY} ${CPPTHREADS_LIBRARY_FLAG}") 241 242 MESSAGE(STATUS " ") 242 243 -
OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Core/Modelica/ModelicaConfig_gcc.inc.in
r573788c ra767f054 1 1 BOOST_LIBS=@Boost_LIBS_@ 2 2 BOOST_INCLUDE=@Boost_INCLUDE_@ 3 BOOST_LIBRARIES=@Boost_LIBRARIES_@ 3 BOOST_LIBRARIES=@Boost_LIBRARIES_@ @CPPTHREADS_LIBRARY_FLAG@ 4 4 5 5 BOOST_SYSTEM_LIB=@Boost_SYSTEM_LIBRARY@ -
OMCompiler/SimulationRuntime/OMSICpp/runtime/src/SimCoreFactory/OMCFactory/CMakeLists.txt
r09a3c55 ra767f054 14 14 target_link_libraries(${OMCFactoryName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${ExtensionUtilitiesName} wsock32 ws2_32) 15 15 ELSE(WIN32) 16 target_link_libraries(${OMCFactoryName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${ExtensionUtilitiesName} pthread)16 target_link_libraries(${OMCFactoryName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${ExtensionUtilitiesName} ${CPPTHREADS_LIBRARY}) 17 17 ENDIF(WIN32) 18 18 add_precompiled_header(${OMCFactoryName} runtime/include/Core/Modelica.h) -
OMCompiler/SimulationRuntime/cpp/CMakeLists.txt
refa7994 ra767f054 480 480 ENDIF(FMU_TARGET AND NOT MSVC) 481 481 482 IF(WIN32) 483 SET(CPPTHREADS_LIBRARY) 484 SET(CPPTHREADS_LIBRARY_FLAG) 485 ELSE(WIN32) 486 find_package(Threads REQUIRED) 487 SET(CPPTHREADS_LIBRARY Threads::Threads) 488 SET(CPPTHREADS_LIBRARY_FLAG ${CMAKE_THREAD_LIBS_INIT}) 489 ENDIF(WIN32) 490 482 491 SET(Boost_LIBRARIES_TMP ${Boost_LIBRARIES_TMP} ${Boost_LIBRARIES}) 483 492 SET(Boost_LIBRARIES ${Boost_LIBRARIES_TMP}) -
OMCompiler/SimulationRuntime/cpp/Core/Modelica/CMakeLists.txt
rf1678de ra767f054 234 234 MESSAGE(STATUS "--UMFPACK_INCLUDE = ${UMFPACK_INCLUDE_}") 235 235 MESSAGE(STATUS "--UMFPACK_LIBRARIES = ${UMFPACK_LIBRARIES_}") 236 MESSAGE(STATUS "--CPPTHREADS_LIBRARY = ${CPPTHREADS_LIBRARY} ${CPPTHREADS_LIBRARY_FLAG}") 237 236 238 MESSAGE(STATUS " ") 237 239 -
OMCompiler/SimulationRuntime/cpp/Core/Modelica/ModelicaConfig_gcc.inc.in
r51b27284 ra767f054 1 1 BOOST_LIBS=@Boost_LIBS_@ 2 2 BOOST_INCLUDE=@Boost_INCLUDE_@ 3 BOOST_LIBRARIES=@Boost_LIBRARIES_@ 3 BOOST_LIBRARIES=@Boost_LIBRARIES_@ @CPPTHREADS_LIBRARY_FLAG@ 4 4 5 5 BOOST_SYSTEM_LIB=@Boost_SYSTEM_LIBRARY@ -
OMCompiler/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/CMakeLists.txt
r51b27284 ra767f054 12 12 target_link_libraries(${OMCFactoryName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${ExtensionUtilitiesName} wsock32 ws2_32) 13 13 ELSE(WIN32) 14 target_link_libraries(${OMCFactoryName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${ExtensionUtilitiesName} )14 target_link_libraries(${OMCFactoryName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${ExtensionUtilitiesName} ${CPPTHREADS_LIBRARY}) 15 15 ENDIF(WIN32) 16 16 add_precompiled_header(${OMCFactoryName} Include/Core/Modelica.h)
Note: See TracChangeset
for help on using the changeset viewer.