copy Visual Studio libs and pdb of cpp runtime with CMake instead of …

…make

Belonging to [master]:
  - OpenModelica/OMCompiler#2297

SimulationRuntime/cpp/CMakeLists.txt

@@ -92,7 +92,11 @@ OPTION(USE_CPP_03 "USE_CPP_03" OFF)
 
 #Set Variables
 IF(NOT FMU_TARGET)
+ IF(MSVC)
+  SET(LIBINSTALLEXT "lib/omc/cpp/msvc" CACHE STRING "library directory")
+ ELSE(MSVC)
   SET(LIBINSTALLEXT "lib/omc/cpp" CACHE STRING "library directory")
+ENDIF()
 ENDIF(NOT FMU_TARGET)
 SET(MODELICA_MODEL "ModelicaSystem")
 SET(LIBPREFIX "OMCpp")

SimulationRuntime/cpp/Core/DataExchange/CMakeLists.txt

@@ -1,31 +1,33 @@
-cmake_minimum_required(VERSION 2.8.9)
-
-project(${DataExchangeName})
-
-add_library(${DataExchangeName} SimData.cpp FactoryExport.cpp XmlPropertyReader.cpp)
-
-if(NOT BUILD_SHARED_LIBS)
-  set_target_properties(${DataExchangeName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
-endif(NOT BUILD_SHARED_LIBS)
-
-if(NOT BOOST_STATIC_LINKING)
-  target_link_libraries (${DataExchangeName} ${Boost_LIBRARIES} ${ExtensionUtilitiesName}  ${ModelicaName})
-endif(NOT BOOST_STATIC_LINKING)
-
-add_precompiled_header(${DataExchangeName} Include/Core/Modelica.h)
-
-install(TARGETS ${DataExchangeName} DESTINATION ${LIBINSTALLEXT})
-install(FILES
-  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/IHistory.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/ISimVar.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/SimData.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/Writer.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/SimDouble.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/SimBoolean.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/XmlPropertyReader.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/IPropertyReader.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/FactoryExport.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/FactoryPolicy.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/DefaultContainerManager.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/ParallelContainerManager.h
-  DESTINATION include/omc/cpp/Core/DataExchange)
+cmake_minimum_required(VERSION 2.8.9)
+
+project(${DataExchangeName})
+
+add_library(${DataExchangeName} SimData.cpp FactoryExport.cpp XmlPropertyReader.cpp)
+
+if(NOT BUILD_SHARED_LIBS)
+  set_target_properties(${DataExchangeName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
+endif(NOT BUILD_SHARED_LIBS)
+
+if(NOT BOOST_STATIC_LINKING)
+  target_link_libraries (${DataExchangeName} ${Boost_LIBRARIES} ${ExtensionUtilitiesName}  ${ModelicaName})
+endif(NOT BOOST_STATIC_LINKING)
+
+add_precompiled_header(${DataExchangeName} Include/Core/Modelica.h)
+
+install(FILES $<TARGET_PDB_FILE:${DataExchangeName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+
+install(TARGETS ${DataExchangeName} DESTINATION ${LIBINSTALLEXT})
+install(FILES
+  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/IHistory.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/ISimVar.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/SimData.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/Writer.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/SimDouble.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/SimBoolean.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/XmlPropertyReader.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/IPropertyReader.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/FactoryExport.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/FactoryPolicy.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/DefaultContainerManager.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/DataExchange/ParallelContainerManager.h
+  DESTINATION include/omc/cpp/Core/DataExchange)

SimulationRuntime/cpp/Core/Math/CMakeLists.txt

@@ -1,24 +1,26 @@
-cmake_minimum_required(VERSION 2.8.9)
-
-project(${MathName})
-
-add_library(${MathName} ArrayOperations.cpp Functions.cpp FactoryExport.cpp)
-
-if(NOT BUILD_SHARED_LIBS)
-  set_target_properties(${MathName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
-endif(NOT BUILD_SHARED_LIBS)
-
-target_link_libraries(${MathName} ${Boost_LIBRARIES} ${UMFPACK_LIB} ${LAPACK_LIBRARIES} ${ModelicaName})
-add_precompiled_header(${MathName} Include/Core/Modelica.h )
-
-install(TARGETS ${MathName} DESTINATION ${LIBINSTALLEXT})
-install(FILES ${CMAKE_SOURCE_DIR}/Include/Core/Math/Functions.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/Math/ArrayOperations.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/Math/Utility.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/Math/Constants.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/Math/SparseMatrix.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/Math/ILapack.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/Math/OMAPI.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/Math/Array.h
-  ${CMAKE_SOURCE_DIR}/Include/Core/Math/ArraySlice.h
-  DESTINATION include/omc/cpp/Core/Math)
+cmake_minimum_required(VERSION 2.8.9)
+
+project(${MathName})
+
+add_library(${MathName} ArrayOperations.cpp Functions.cpp FactoryExport.cpp)
+
+if(NOT BUILD_SHARED_LIBS)
+  set_target_properties(${MathName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
+endif(NOT BUILD_SHARED_LIBS)
+
+target_link_libraries(${MathName} ${Boost_LIBRARIES} ${UMFPACK_LIB} ${LAPACK_LIBRARIES} ${ModelicaName})
+add_precompiled_header(${MathName} Include/Core/Modelica.h )
+
+install(FILES $<TARGET_PDB_FILE:${MathName}> DESTINATION ${LIBINSTALLEXT} OPTIONAL)
+
+install(TARGETS ${MathName} DESTINATION ${LIBINSTALLEXT})
+install(FILES ${CMAKE_SOURCE_DIR}/Include/Core/Math/Functions.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/Math/ArrayOperations.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/Math/Utility.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/Math/Constants.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/Math/SparseMatrix.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/Math/ILapack.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/Math/OMAPI.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/Math/Array.h
+  ${CMAKE_SOURCE_DIR}/Include/Core/Math/ArraySlice.h
+  DESTINATION include/omc/cpp/Core/Math)