Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit fc8513b

Browse files
niklworsOpenModelica-Hudson
niklwors
authored and
OpenModelica-Hudson
committed
copy Visual Studio libs and pdb of cpp runtime with CMake instead of make
Belonging to [master]: - #2297
1 parent 20606a9 commit fc8513b

File tree

32 files changed

+534
-515
lines changed

32 files changed

+534
-515
lines changed

‎SimulationRuntime/cpp/.vs/ProjectSettings.json‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎SimulationRuntime/cpp/.vs/VSWorkspaceState.json‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎SimulationRuntime/cpp/.vs/cpp/v15/.suo‎

-26 KB
Binary file not shown.

‎SimulationRuntime/cpp/.vs/slnx.sqlite‎

-676 KB
Binary file not shown.

‎SimulationRuntime/cpp/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,11 @@ OPTION(USE_CPP_03 "USE_CPP_03" OFF)
9292

9393
#Set Variables
9494
IF(NOT FMU_TARGET)
95+
IF(MSVC)
96+
SET(LIBINSTALLEXT "lib/omc/cpp/msvc" CACHE STRING "library directory")
97+
ELSE(MSVC)
9598
SET(LIBINSTALLEXT "lib/omc/cpp" CACHE STRING "library directory")
99+
ENDIF()
96100
ENDIF(NOT FMU_TARGET)
97101
SET(MODELICA_MODEL "ModelicaSystem")
98102
SET(LIBPREFIX "OMCpp")

‎SimulationRuntime/cpp/Core/DataExchange/CMakeLists.txt‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
1-
cmake_minimum_required(VERSION 2.8.9)
2-
3-
project(${DataExchangeName})
4-
5-
add_library(${DataExchangeName} SimData.cpp FactoryExport.cpp XmlPropertyReader.cpp)
6-
7-
if(NOT BUILD_SHARED_LIBS)
8-
set_target_properties(${DataExchangeName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
9-
endif(NOT BUILD_SHARED_LIBS)
10-
11-
if(NOT BOOST_STATIC_LINKING)
12-
target_link_libraries (${DataExchangeName} ${Boost_LIBRARIES} ${ExtensionUtilitiesName} ${ModelicaName})
13-
endif(NOT BOOST_STATIC_LINKING)
14-
15-
add_precompiled_header(${DataExchangeName} Include/Core/Modelica.h)
16-
17-
install(TARGETS ${DataExchangeName} DESTINATION ${LIBINSTALLEXT})
18-
install(FILES
19-
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/IHistory.h
20-
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/ISimVar.h
21-
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/SimData.h
22-
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/Writer.h
23-
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/SimDouble.h
24-
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/SimBoolean.h
25-
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/XmlPropertyReader.h
26-
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/IPropertyReader.h
27-
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/FactoryExport.h
28-
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/FactoryPolicy.h
29-
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/DefaultContainerManager.h
30-
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/ParallelContainerManager.h
31-
DESTINATION include/omc/cpp/Core/DataExchange)
1+
cmake_minimum_required(VERSION 2.8.9)
2+
3+
project(${DataExchangeName})
4+
5+
add_library(${DataExchangeName} SimData.cpp FactoryExport.cpp XmlPropertyReader.cpp)
6+
7+
if(NOT BUILD_SHARED_LIBS)
8+
set_target_properties(${DataExchangeName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
9+
endif(NOT BUILD_SHARED_LIBS)
10+
11+
if(NOT BOOST_STATIC_LINKING)
12+
target_link_libraries (${DataExchangeName} ${Boost_LIBRARIES} ${ExtensionUtilitiesName} ${ModelicaName})
13+
endif(NOT BOOST_STATIC_LINKING)
14+
15+
add_precompiled_header(${DataExchangeName} Include/Core/Modelica.h)
16+
17+
install(FILES $<TARGET_PDB_FILE:${DataExchangeName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
18+
19+
install(TARGETS ${DataExchangeName} DESTINATION ${LIBINSTALLEXT})
20+
install(FILES
21+
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/IHistory.h
22+
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/ISimVar.h
23+
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/SimData.h
24+
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/Writer.h
25+
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/SimDouble.h
26+
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/SimBoolean.h
27+
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/XmlPropertyReader.h
28+
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/IPropertyReader.h
29+
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/FactoryExport.h
30+
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/FactoryPolicy.h
31+
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/DefaultContainerManager.h
32+
${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/ParallelContainerManager.h
33+
DESTINATION include/omc/cpp/Core/DataExchange)

‎SimulationRuntime/cpp/Core/Math/CMakeLists.txt‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
1-
cmake_minimum_required(VERSION 2.8.9)
2-
3-
project(${MathName})
4-
5-
add_library(${MathName} ArrayOperations.cpp Functions.cpp FactoryExport.cpp)
6-
7-
if(NOT BUILD_SHARED_LIBS)
8-
set_target_properties(${MathName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
9-
endif(NOT BUILD_SHARED_LIBS)
10-
11-
target_link_libraries(${MathName} ${Boost_LIBRARIES} ${UMFPACK_LIB} ${LAPACK_LIBRARIES} ${ModelicaName})
12-
add_precompiled_header(${MathName} Include/Core/Modelica.h )
13-
14-
install(TARGETS ${MathName} DESTINATION ${LIBINSTALLEXT})
15-
install(FILES ${CMAKE_SOURCE_DIR}/Include/Core/Math/Functions.h
16-
${CMAKE_SOURCE_DIR}/Include/Core/Math/ArrayOperations.h
17-
${CMAKE_SOURCE_DIR}/Include/Core/Math/Utility.h
18-
${CMAKE_SOURCE_DIR}/Include/Core/Math/Constants.h
19-
${CMAKE_SOURCE_DIR}/Include/Core/Math/SparseMatrix.h
20-
${CMAKE_SOURCE_DIR}/Include/Core/Math/ILapack.h
21-
${CMAKE_SOURCE_DIR}/Include/Core/Math/OMAPI.h
22-
${CMAKE_SOURCE_DIR}/Include/Core/Math/Array.h
23-
${CMAKE_SOURCE_DIR}/Include/Core/Math/ArraySlice.h
24-
DESTINATION include/omc/cpp/Core/Math)
1+
cmake_minimum_required(VERSION 2.8.9)
2+
3+
project(${MathName})
4+
5+
add_library(${MathName} ArrayOperations.cpp Functions.cpp FactoryExport.cpp)
6+
7+
if(NOT BUILD_SHARED_LIBS)
8+
set_target_properties(${MathName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
9+
endif(NOT BUILD_SHARED_LIBS)
10+
11+
target_link_libraries(${MathName} ${Boost_LIBRARIES} ${UMFPACK_LIB} ${LAPACK_LIBRARIES} ${ModelicaName})
12+
add_precompiled_header(${MathName} Include/Core/Modelica.h )
13+
14+
install(FILES $<TARGET_PDB_FILE:${MathName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
15+
16+
install(TARGETS ${MathName} DESTINATION ${LIBINSTALLEXT})
17+
install(FILES ${CMAKE_SOURCE_DIR}/Include/Core/Math/Functions.h
18+
${CMAKE_SOURCE_DIR}/Include/Core/Math/ArrayOperations.h
19+
${CMAKE_SOURCE_DIR}/Include/Core/Math/Utility.h
20+
${CMAKE_SOURCE_DIR}/Include/Core/Math/Constants.h
21+
${CMAKE_SOURCE_DIR}/Include/Core/Math/SparseMatrix.h
22+
${CMAKE_SOURCE_DIR}/Include/Core/Math/ILapack.h
23+
${CMAKE_SOURCE_DIR}/Include/Core/Math/OMAPI.h
24+
${CMAKE_SOURCE_DIR}/Include/Core/Math/Array.h
25+
${CMAKE_SOURCE_DIR}/Include/Core/Math/ArraySlice.h
26+
DESTINATION include/omc/cpp/Core/Math)

0 commit comments

Comments
 (0)