Skip to content

Commit

Permalink
Fixed build issue with Cpp runtime
Browse files Browse the repository at this point in the history
- the CppDassl library is now only generated if CMake is able to find OpenMP suppoprt and Umfpack
  • Loading branch information
Marcus Walther committed Dec 11, 2015
1 parent 5fcf1c8 commit 9b84eda
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions SimulationRuntime/cpp/CMakeLists.txt
Expand Up @@ -550,7 +550,16 @@ add_subdirectory (Solver/Broyden)
add_subdirectory (Solver/Hybrj)
add_subdirectory (Solver/UmfPack)
add_subdirectory (Solver/Peer)
add_subdirectory (Solver/CppDASSL)
IF(OPENMP_FOUND)
IF(SUITESPARSE_UMFPACK_FOUND)
MESSAGE(STATUS "CppDassl enabled")
add_subdirectory (Solver/CppDASSL)
ELSE(SUITESPARSE_UMFPACK_FOUND)
MESSAGE(STATUS "CppDassl disabled, because of missing UMFPACK support")
ENDIF(SUITESPARSE_UMFPACK_FOUND)
ELSE(OPENMP_FOUND)
MESSAGE(STATUS "CppDassl disabled, because of missing OpenMP support")
ENDIF(OPENMP_FOUND)
##add_subdirectory (Solver/RTRK)

add_subdirectory (FMU)
Expand Down Expand Up @@ -596,8 +605,10 @@ ENDIF(USE_SUNDIALS)
GET_TARGET_PROPERTY(libPeer ${PeerName} LOCATION)
GET_FILENAME_COMPONENT(libPeerName ${libPeer} NAME)

GET_TARGET_PROPERTY(libCppDASSL ${CppDASSLName} LOCATION)
GET_FILENAME_COMPONENT(libCppDASSLName ${libCppDASSL} NAME)
IF(OPENMP_FOUND)
GET_TARGET_PROPERTY(libCppDASSL ${CppDASSLName} LOCATION)
GET_FILENAME_COMPONENT(libCppDASSLName ${libCppDASSL} NAME)
ENDIF(OPENMP_FOUND)

GET_TARGET_PROPERTY(libRTRK ${RTRKName} LOCATION)
GET_FILENAME_COMPONENT(libRTRKName ${libRTRK} NAME)
Expand Down

0 comments on commit 9b84eda

Please sign in to comment.