Skip to content

Commit

Permalink
Exploit CMAKE_POSITION_INDEPENDENT_CODE in Cpp runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
rfranke committed Mar 13, 2016
1 parent 1be7936 commit 1aa2612
Show file tree
Hide file tree
Showing 25 changed files with 34 additions and 173 deletions.
3 changes: 2 additions & 1 deletion SimulationRuntime/cpp/CMakeLists.txt
Expand Up @@ -32,10 +32,11 @@
#
# The used defines are stored in the SYSTEM_CFLAGS variable, which is passed to the ModelicaConfig.inc and written in the PrecompiledHeader.cmake

CMAKE_MINIMUM_REQUIRED (VERSION 2.8.6)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
PROJECT(CppSolverInterface)
SET(CMAKE_VERBOSE_MAKEFILE ON)
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")
SET(CMAKE_POSITION_INDEPENDENT_CODE ON)

MESSAGE(STATUS "CMake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")

Expand Down
6 changes: 1 addition & 5 deletions SimulationRuntime/cpp/Core/DataExchange/CMakeLists.txt
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${DataExchangeName})

Expand All @@ -18,10 +18,6 @@ IF(NOT BOOST_STATIC_LINKING)
target_link_libraries (${DataExchangeName}_static ${Boost_LIBRARIES})
ENDIF(NOT BOOST_STATIC_LINKING)

if (UNIX)
set_target_properties(${DataExchangeName}_static PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

install (TARGETS ${DataExchangeName} DESTINATION ${LIBINSTALLEXT})
install (TARGETS ${DataExchangeName}_static DESTINATION ${LIBINSTALLEXT})

Expand Down
11 changes: 1 addition & 10 deletions SimulationRuntime/cpp/Core/Math/CMakeLists.txt
@@ -1,24 +1,15 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${MathName})
# add the solver default implementation library

add_library(${MathName}_static STATIC ArrayOperations.cpp Functions.cpp FactoryExport.cpp)
add_library(${MathName} SHARED ArrayOperations.cpp Functions.cpp FactoryExport.cpp)

IF(UNIX)
set_target_properties(${MathName}_static PROPERTIES COMPILE_FLAGS -fPIC)
ENDIF(UNIX)

install (TARGETS ${MathName}_static DESTINATION ${LIBINSTALLEXT})

target_link_libraries (${MathName} ${Boost_LIBRARIES} ${UMFPACK_LIB} ${LAPACK_LIBRARIES})
set_target_properties(${MathName}_static PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")

IF(UNIX)
set_target_properties(${MathName} PROPERTIES COMPILE_FLAGS -fPIC)
ENDIF(UNIX)

install (TARGETS ${MathName} DESTINATION ${LIBINSTALLEXT})
add_precompiled_header(${MathName} Include/Core/Modelica.h )

Expand Down
12 changes: 5 additions & 7 deletions SimulationRuntime/cpp/Core/ModelicaExternalC/CMakeLists.txt
@@ -1,14 +1,12 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)
project(${ModelicaExternalName})
ADD_DEFINITIONS(-DDUMMY_FUNCTION_USERTAB)
include_directories (${MODELICAEXTERNALCDIR})
# include_directories (${USERTABDIR})
add_library(${ModelicaExternalName} ${MODELICAEXTERNALCDIR}/ModelicaStandardTables.c ${MODELICAEXTERNALCDIR}/ModelicaMatIO.c ${MODELICAEXTERNALCDIR}/ModelicaInternal.c ${MODELICAEXTERNALCDIR}/ModelicaStrings.c) # ${USERTABDIR}/usertab.c
add_library(${ModelicaTablesName} ${MODELICAEXTERNALCDIR}/ModelicaStandardTables.c ${MODELICAEXTERNALCDIR}/ModelicaMatIO.c) # ${USERTABDIR}/usertab.c
if (UNIX)
set_target_properties(${ModelicaExternalName} PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${ModelicaTablesName} PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

add_library(${ModelicaExternalName} STATIC ${MODELICAEXTERNALCDIR}/ModelicaStandardTables.c ${MODELICAEXTERNALCDIR}/ModelicaMatIO.c ${MODELICAEXTERNALCDIR}/ModelicaInternal.c ${MODELICAEXTERNALCDIR}/ModelicaStrings.c) # ${USERTABDIR}/usertab.c
add_library(${ModelicaTablesName} STATIC ${MODELICAEXTERNALCDIR}/ModelicaStandardTables.c ${MODELICAEXTERNALCDIR}/ModelicaMatIO.c) # ${USERTABDIR}/usertab.c

install (TARGETS ${ModelicaExternalName} DESTINATION ${LIBINSTALLEXT})
install (TARGETS ${ModelicaTablesName} DESTINATION ${LIBINSTALLEXT})
#lib/omc/cpp
7 changes: 1 addition & 6 deletions SimulationRuntime/cpp/Core/SimController/CMakeLists.txt
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${SimControllerName})

Expand All @@ -12,11 +12,6 @@ target_link_libraries( ${SimControllerName} ${OMCFactoryName}_static ${Extension
add_precompiled_header(${SimControllerName} Include/Core/Modelica.h)
install (TARGETS ${SimControllerName} DESTINATION ${LIBINSTALLEXT})

if (UNIX)
set_target_properties(${SimControllerName} PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${SimControllerName}_static PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

install (FILES ${CMAKE_SOURCE_DIR}/Include/Core/SimController/ISimData.h
${CMAKE_SOURCE_DIR}/Include/Core/SimController/ISimObjects.h
${CMAKE_SOURCE_DIR}/Include/Core/SimController/ISimController.h
Expand Down
7 changes: 1 addition & 6 deletions SimulationRuntime/cpp/Core/SimulationSettings/CMakeLists.txt
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${SimulationSettings})

Expand All @@ -14,11 +14,6 @@ target_link_libraries( ${SimulationSettings} ${OMCFactoryName}_static ${Boost_LI
add_precompiled_header(${SimulationSettings} Include/Core/Modelica.h)
install (TARGETS ${SimulationSettings} DESTINATION ${LIBINSTALLEXT})

if (UNIX)
set_target_properties(${SimulationSettings} PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${SimulationSettings}_static PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

install (FILES "config/GlobalSettings.xml" DESTINATION share/omc/runtime/cpp/config)
install (FILES ${CMAKE_SOURCE_DIR}/Include/Core/SimulationSettings/IGlobalSettings.h
${CMAKE_SOURCE_DIR}/Include/Core/SimulationSettings/ISettingsFactory.h
Expand Down
7 changes: 1 addition & 6 deletions SimulationRuntime/cpp/Core/Solver/CMakeLists.txt
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${SolverName})

Expand All @@ -13,11 +13,6 @@ target_link_libraries (${SolverName} ${MathName} ${Boost_LIBRARIES} ${ExtensionU
add_precompiled_header(${SolverName} Include/Core/Modelica.h)
install (TARGETS ${SolverName} DESTINATION ${LIBINSTALLEXT})

if (UNIX)
set_target_properties(${SolverName}_static PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${SolverName} PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

install (FILES
${CMAKE_SOURCE_DIR}/Include/Core/Solver/IAlgLoopSolver.h
${CMAKE_SOURCE_DIR}/Include/Core/Solver/ILinSolverSettings.h
Expand Down
7 changes: 1 addition & 6 deletions SimulationRuntime/cpp/Core/System/CMakeLists.txt
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${SystemName})
set(BASE_LIB "" CACHE INTERNAL "" )
Expand All @@ -23,11 +23,6 @@ target_link_libraries (${SystemName} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES} ${OM
add_precompiled_header(${SystemName} Include/Core/Modelica.h)
install (TARGETS ${SystemName} DESTINATION ${LIBINSTALLEXT})

if (UNIX)
set_target_properties(${SystemName} PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${SystemName}_static PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

#IF (NOT ((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") OR MSVC))
#install (TARGETS ${BasiLibName} DESTINATION ${LIBINSTALLEXT})
#ENDIF (NOT ((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") OR MSVC))
Expand Down
7 changes: 1 addition & 6 deletions SimulationRuntime/cpp/Core/Utils/Modelica/CMakeLists.txt
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${ModelicaUtilitiesName})
# add the solver default implementation library
Expand All @@ -8,11 +8,6 @@ set_target_properties(${ModelicaUtilitiesName}_static PROPERTIES COMPILE_DEFINIT
add_library(${ModelicaUtilitiesName} SHARED ModelicaUtilities.cpp ModelicaSimulationError.cpp)
add_precompiled_header(${ModelicaUtilitiesName} Include/Core/Modelica.h )

if (UNIX)
set_target_properties(${ModelicaUtilitiesName}_static PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${ModelicaUtilitiesName} PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

target_link_libraries (${ModelicaUtilitiesName} ${Boost_LIBRARIES})
install (TARGETS ${ModelicaUtilitiesName}_static DESTINATION ${LIBINSTALLEXT})
install (TARGETS ${ModelicaUtilitiesName} DESTINATION ${LIBINSTALLEXT})
Expand Down
9 changes: 1 addition & 8 deletions SimulationRuntime/cpp/Core/Utils/extension/CMakeLists.txt
@@ -1,25 +1,18 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${ExtensionUtilitiesName})

add_library(${ExtensionUtilitiesName}_static STATIC measure_time.cpp measure_time_statistic.cpp measure_time_rdtsc.cpp measure_time_scorep.cpp logger.cpp)
IF(NOT BOOST_STATIC_LINKING)
target_link_libraries (${ExtensionUtilitiesName}_static ${Boost_LIBRARIES})
ENDIF(NOT BOOST_STATIC_LINKING)
IF(UNIX)
set_target_properties(${ExtensionUtilitiesName}_static PROPERTIES COMPILE_FLAGS -fPIC)
ENDIF(UNIX)
set_target_properties(${ExtensionUtilitiesName}_static PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
install (TARGETS ${ExtensionUtilitiesName}_static DESTINATION ${LIBINSTALLEXT})

add_library(${ExtensionUtilitiesName} SHARED measure_time.cpp measure_time_statistic.cpp measure_time_rdtsc.cpp measure_time_scorep.cpp logger.cpp)
IF(NOT BOOST_STATIC_LINKING)
target_link_libraries (${ExtensionUtilitiesName} ${Boost_LIBRARIES})
ENDIF(NOT BOOST_STATIC_LINKING)
IF(UNIX)
set_target_properties(${ExtensionUtilitiesName}_static PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${ExtensionUtilitiesName} PROPERTIES COMPILE_FLAGS -fPIC)
ENDIF(UNIX)

install (TARGETS ${ExtensionUtilitiesName}_static DESTINATION ${LIBINSTALLEXT})
install (TARGETS ${ExtensionUtilitiesName} DESTINATION ${LIBINSTALLEXT})
Expand Down
7 changes: 1 addition & 6 deletions SimulationRuntime/cpp/FMU/CMakeLists.txt
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${FMUName})

Expand All @@ -13,11 +13,6 @@ target_link_libraries (${FMUName}_static ${ExtensionUtilitiesName}_static )
add_precompiled_header(${FMUName} Include/Core/Modelica.h)
add_precompiled_header(${FMUName}_static Include/Core/Modelica.h)

if (UNIX)
set_target_properties(${FMUName} PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${FMUName}_static PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

target_link_libraries (${FMUName} ${ExtensionUtilitiesName})
target_link_libraries (${FMUName}_static ${ExtensionUtilitiesName}_static)

Expand Down
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${OMCFactoryName})

Expand All @@ -11,11 +11,6 @@ include_directories(${SUNDIALS_INCLUDE_DIR}/cvodes ${SUNDIALS_INCLUDE_DIR}/nvect
install (TARGETS ${OMCFactoryName}_static DESTINATION ${LIBINSTALLEXT})
install (TARGETS ${OMCFactoryName} DESTINATION ${LIBINSTALLEXT})

if (UNIX)
set_target_properties(${OMCFactoryName}_static PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${OMCFactoryName} PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

target_link_libraries(${OMCFactoryName} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${ExtensionUtilitiesName})
add_precompiled_header(${OMCFactoryName}_static Include/Core/Modelica.h)
add_precompiled_header(${OMCFactoryName} Include/Core/Modelica.h)
Expand Down
9 changes: 1 addition & 8 deletions SimulationRuntime/cpp/Solver/Broyden/CMakeLists.txt
@@ -1,9 +1,7 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${BroydenName})

# add the solver default implementation library

#include_directories(${SUNDIALS_INCLUDE_DIR}/cvodes ${SUNDIALS_INCLUDE_DIR}/nvector ${SUNDIALS_INCLUDE_DIR}/sundials ${SUNDIALS_INCLUDE_DIR})
add_library(${BroydenName}_static STATIC Broyden.cpp BroydenSettings.cpp FactoryExport.cpp )
add_precompiled_header(${BroydenName}_static Include/Core/Modelica.h )
Expand All @@ -14,11 +12,6 @@ target_link_libraries( ${BroydenName} ${ExtensionUtilitiesName} ${Boost_LIBRARIE
#target_link_libraries(${BroydenName} ${ExtensionUtilitiesName} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES} ${kluName})
add_precompiled_header(${BroydenName} Include/Core/Modelica.h )

if (UNIX)
set_target_properties(${BroydenName}_static PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${BroydenName} PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

install (TARGETS ${BroydenName} ${BroydenName}_static DESTINATION ${LIBINSTALLEXT})

install (FILES ${CMAKE_SOURCE_DIR}/Include/Solver/Broyden/Broyden.h
Expand Down
15 changes: 1 addition & 14 deletions SimulationRuntime/cpp/Solver/CVode/CMakeLists.txt
@@ -1,10 +1,8 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${CVodeName})
#include_directories(${SUNDIALS_INCLUDE_DIR}/cvodes ${SUNDIALS_INCLUDE_DIR}/nvector ${SUNDIALS_INCLUDE_DIR}/sundials ${SUNDIALS_INCLUDE_DIR})

# add the solver default implementation library

add_library(${CVodeName}_static STATIC CVode.cpp CVodeSettings.cpp FactoryExport.cpp)
add_precompiled_header(${CVodeName}_static Include/Core/Modelica.h )
set_target_properties(${CVodeName}_static PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
Expand All @@ -18,17 +16,6 @@ add_precompiled_header(${CVodeName} Include/Core/Modelica.h )

install (TARGETS ${CVodeName} ${CVodeName}_static DESTINATION ${LIBINSTALLEXT})

if (UNIX)
set_target_properties(${CVodeName}_static PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${CVodeName} PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

#target_link_libraries( Euler ${Boost_serialization_LIBRARY})


#install (FILES "../Interfaces/EulerSettings.xml"
# DESTINATION bin/config)

install (FILES ${CMAKE_SOURCE_DIR}/Include/Solver/CVode/CVode.h
${CMAKE_SOURCE_DIR}/Include/Solver/CVode/FactoryExport.h
DESTINATION include/omc/cpp/Solver/CVode)
12 changes: 3 additions & 9 deletions SimulationRuntime/cpp/Solver/CppDASSL/CMakeLists.txt
@@ -1,8 +1,7 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${CppDASSLName})

# add the solver default implementation library
add_library(${CppDASSLName}_static STATIC ddaskr.cpp CppDASSL.cpp CppDASSLSettings.cpp FactoryExport.cpp)

SET(CPPDASSL_COMPILE_DEFINITIONS "")
Expand All @@ -26,13 +25,8 @@ ENDIF(OPENMP_FOUND)
set_target_properties(${CppDASSLName}_static PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;${CPPDASSL_COMPILE_DEFINITIONS}")
set_target_properties(${CppDASSLName} PROPERTIES COMPILE_DEFINITIONS "${CPPDASSL_COMPILE_DEFINITIONS}")

if (UNIX)
set_target_properties(${CppDASSLName}_static PROPERTIES COMPILE_FLAGS "-fPIC ${OpenMP_CXX_FLAGS}")
set_target_properties(${CppDASSLName} PROPERTIES COMPILE_FLAGS "-fPIC ${OpenMP_CXX_FLAGS}")
else(UNIX)
set_target_properties(${CppDASSLName}_static PROPERTIES COMPILE_FLAGS "${OpenMP_CXX_FLAGS}")
set_target_properties(${CppDASSLName} PROPERTIES COMPILE_FLAGS "${OpenMP_CXX_FLAGS}")
endif(UNIX)
set_target_properties(${CppDASSLName}_static PROPERTIES COMPILE_FLAGS "${OpenMP_CXX_FLAGS}")
set_target_properties(${CppDASSLName} PROPERTIES COMPILE_FLAGS "${OpenMP_CXX_FLAGS}")

add_precompiled_header(${CppDASSLName} Include/Core/Modelica.h )

Expand Down
5 changes: 1 addition & 4 deletions SimulationRuntime/cpp/Solver/Dgesv/CMakeLists.txt
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${DgesvName})

Expand All @@ -8,9 +8,6 @@ IF(DGESV_FOUND)
add_library(${DgesvName}_static STATIC ${DGESV_SRCS})
install(TARGETS ${DgesvName}_static DESTINATION ${LIBINSTALLEXT})
install(FILES ${DGESV_HEADERS} DESTINATION include/omc/cpp/Solver/Dgesv)
IF(UNIX)
set_target_properties(${DgesvName}_static PROPERTIES COMPILE_FLAGS -fPIC)
ENDIF(UNIX)
GET_TARGET_PROPERTY(libDgesvLocation ${DgesvName}_static LOCATION)
GET_FILENAME_COMPONENT(libDgesvExt ${libDgesvLocation} EXT CACHE)
ELSE()
Expand Down
8 changes: 1 addition & 7 deletions SimulationRuntime/cpp/Solver/Euler/CMakeLists.txt
@@ -1,7 +1,6 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${EulerName})
# add the solver default implementation library

add_library(${EulerName}_static STATIC Euler.cpp EulerSettings.cpp FactoryExport.cpp )
add_precompiled_header(${EulerName}_static Include/Core/Modelica.h )
Expand All @@ -11,11 +10,6 @@ include_directories(${SUNDIALS_INCLUDE_DIR}/cvodes ${SUNDIALS_INCLUDE_DIR}/nvect
add_library(${EulerName} SHARED Euler.cpp EulerSettings.cpp FactoryExport.cpp )
add_precompiled_header(${EulerName} Include/Core/Modelica.h )

if (UNIX)
set_target_properties(${EulerName}_static PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${EulerName} PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

target_link_libraries (${EulerName} ${SolverName} ${Boost_LIBRARIES} ${LAPACK_LIBRARIES} )

install (TARGETS ${EulerName} ${EulerName}_static DESTINATION ${LIBINSTALLEXT})
Expand Down
8 changes: 1 addition & 7 deletions SimulationRuntime/cpp/Solver/Hybrj/CMakeLists.txt
@@ -1,7 +1,6 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${HybrjName})
# add the solver default implementation library

add_library(${HybrjName}_static STATIC Hybrj.cpp HybrjSettings.cpp FactoryExport.cpp )
set_target_properties(${HybrjName}_static PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING")
Expand All @@ -11,11 +10,6 @@ include_directories(${SUNDIALS_INCLUDE_DIR}/cvodes ${SUNDIALS_INCLUDE_DIR}/nvect
add_library(${HybrjName} SHARED Hybrj.cpp HybrjSettings.cpp FactoryExport.cpp )
add_precompiled_header(${HybrjName} Include/Core/Modelica.h )

if (UNIX)
set_target_properties(${HybrjName}_static PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${HybrjName} PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

target_link_libraries( ${HybrjName} ${Boost_LIBRARIES})
target_link_libraries( ${HybrjName} ${LAPACK_LIBRARIES} ${CMINPACK_LIBRARY})
message(STATUS ${CMINPACK_LIBRARY})
Expand Down
8 changes: 1 addition & 7 deletions SimulationRuntime/cpp/Solver/IDA/CMakeLists.txt
@@ -1,9 +1,8 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_minimum_required(VERSION 2.8.9)

project(${IDAName})
#include_directories(${SUNDIALS_INCLUDE_DIR}/ida ${SUNDIALS_INCLUDE_DIR}/nvector ${SUNDIALS_INCLUDE_DIR}/sundials ${SUNDIALS_INCLUDE_DIR})

# add the solver default implementation library
add_library(${IDAName}_static STATIC IDA.cpp IDASettings.cpp FactoryExport.cpp)
set_target_properties(${IDAName}_static PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")
add_precompiled_header(${IDAName}_static Include/Core/Modelica.h )
Expand All @@ -12,11 +11,6 @@ add_library(${IDAName} SHARED IDA.cpp IDASettings.cpp FactoryExport.cpp)
target_link_libraries (${IDAName} ${SolverName} ${ExtensionUtilitiesName} ${Boost_LIBRARIES} ${SUNDIALS_LIBRARIES})
add_precompiled_header(${IDAName} Include/Core/Modelica.h )

if (UNIX)
set_target_properties(${IDAName}_static PROPERTIES COMPILE_FLAGS -fPIC)
set_target_properties(${IDAName} PROPERTIES COMPILE_FLAGS -fPIC)
endif(UNIX)

install (TARGETS ${IDAName} ${IDAName}_static DESTINATION ${LIBINSTALLEXT})

install (FILES ${CMAKE_SOURCE_DIR}/Include/Solver/IDA/IDA.h
Expand Down

0 comments on commit 1aa2612

Please sign in to comment.