From 4ef0c298577f3ac62a9f6a83973dedd7f0d735a5 Mon Sep 17 00:00:00 2001 From: Mavo Date: Mon, 14 Nov 2016 16:05:05 +0100 Subject: [PATCH] Build pycarl from within storm Former-commit-id: 817b2429db96211f04dc92466411fdf42f8bb23d --- resources/3rdparty/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index 3a9cb14af..2a2890360 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -207,16 +207,19 @@ if(USE_CARL) list(APPEND STORM_LINK_LIBRARIES ${carl_LIBRARIES}) else() message(STATUS "Storm - Using shipped version of carl.") - # + set(CARL_BUILD_COMMAND make lib_carl) + if(STORM_PYTHON) + set(CARL_BUILD_COMMAND ${CARL_BUILD_COMMAND} PythonBindingsDevelop) + endif() ExternalProject_Add( carl GIT_REPOSITORY https://github.com/smtrat/carl GIT_TAG master INSTALL_DIR ${STORM_3RDPARTY_BINARY_DIR}/carl SOURCE_DIR ${STORM_3RDPARTY_SOURCE_DIR}/carl - CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DBOOST_INCLUDEDIR=${Boost_INCLUDE_DIRS} -DBOOST_LIBRARYDIR=${Boost_LIBRARY_DIRS} -DBoost_NO_SYSTEM_PATHS=1 -DEXPORT_TO_CMAKE=0 -DUSE_CLN_NUMBERS=1 -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=1 -DCMAKE_INSTALL_PREFIX:PATH=${STORM_3RDPARTY_BINARY_DIR}/carl + CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DBOOST_INCLUDEDIR=${Boost_INCLUDE_DIRS} -DBOOST_LIBRARYDIR=${Boost_LIBRARY_DIRS} -DBoost_NO_SYSTEM_PATHS=1 -DEXPORT_TO_CMAKE=0 -DUSE_CLN_NUMBERS=1 -DBINDINGS_PYTHON=${STORM_PYTHON} -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=1 -DCMAKE_INSTALL_PREFIX:PATH=${STORM_3RDPARTY_BINARY_DIR}/carl BUILD_IN_SOURCE 0 - BUILD_COMMAND make lib_carl + BUILD_COMMAND ${CARL_BUILD_COMMAND} INSTALL_COMMAND "" LOG_UPDATE ON LOG_CONFIGURE ON