Skip to content

Commit

Permalink
fix for release build with VS 2015 of cpp runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
@niklwors @OpenModelica-Hudson
niklwors authored and OpenModelica-Hudson committed Mar 17, 2017
1 parent b93e15a commit bff5906
Show file tree
Hide file tree
Showing 13 changed files with 540 additions and 542 deletions.
15 changes: 6 additions & 9 deletions Compiler/Template/CodegenCpp.tpl
View file
Expand Up @@ -3114,16 +3114,13 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
CPPFLAGS =
# /ZI enable Edit and Continue debug info
CDFLAGS = /ZI

# /MD - link with MSVCRT.LIB
# /link - [linker options and libraries]
# /LIBPATH: - Directories where libs can be found
#LDFLAGS=/MDd /link /DLL /NOENTRY /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)" OMCppSystem.lib OMCppMath.lib
#LDSYSTEMFLAGS=/MD /Debug /link /DLL /NOENTRY /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)" OMCppSystem.lib OMCppModelicaUtilities.lib OMCppMath.lib OMCppOMCFactory.lib
!IF "$(PCH_FILE)" == ""
LDSYSTEMFLAGS= /link /DLL /NOENTRY /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/msvc" /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/msvc/debug" /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)" OMCppSystem.lib OMCppModelicaUtilities.lib OMCppMath.lib OMCppDataExchange.lib OMCppOMCFactory.lib <%timeMeasureLink%> WSock32.lib Ws2_32.lib
#LDMAINFLAGS=/MD /Debug /link /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" OMCppOMCFactory.lib /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)"
LDMAINFLAGS=/link /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/msvc" OMCppOMCFactory.lib OMCppModelicaUtilities.lib <%timeMeasureLink%> /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)"
# /MDd link with MSVCRTD.LIB debug lib
LDMAINFLAGS=/link /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/msvc" OMCppOMCFactory.lib OMCppModelicaUtilities.lib <%timeMeasureLink%> /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)"
!ELSE
LDSYSTEMFLAGS= /link /DLL /NOENTRY /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/msvc" /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/msvc/debug" /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)" OMCppSystem.lib OMCppModelicaUtilities.lib OMCppMath.lib OMCppDataExchange.lib OMCppOMCFactory.lib $(PCH_LIB) <%timeMeasureLink%> WSock32.lib Ws2_32.lib
LDMAINFLAGS=/link /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/lib/<%getTriple()%>/omc/msvc" OMCppOMCFactory.lib OMCppModelicaUtilities.lib $(PCH_LIB) <%timeMeasureLink%> /LIBPATH:"<%makefileParams.omhome%>/bin" /LIBPATH:"$(BOOST_LIBS)"
!ENDIF
# lib names should not be appended with a d just switch to lib/omc/cpp


Expand Down
62 changes: 31 additions & 31 deletions SimulationRuntime/cpp/Core/DataExchange/CMakeLists.txt
View file
@@ -1,31 +1,31 @@
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})
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(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)
48 changes: 24 additions & 24 deletions SimulationRuntime/cpp/Core/Math/CMakeLists.txt
View file
@@ -1,24 +1,24 @@
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})
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(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)

0 comments on commit bff5906

Please sign in to comment.