diff --git a/CMakeLists.txt b/CMakeLists.txt index 274cb0350..d801a98be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,13 +7,10 @@ project (storm CXX C) include_directories("${PROJECT_SOURCE_DIR}") include_directories("${PROJECT_SOURCE_DIR}/src") -# Add the version of Eigen3 in the repository to the include pathes -set(EIGEN3_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/eigen") -include_directories(${EIGEN3_INCLUDE_DIR}) -# Add the version of GMM in the repository to the include pathes -set(GMMXX_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/gmm-5.0/include") -include_directories(${GMMXX_INCLUDE_DIR}) +# Add the resources/cmake folder to Module Search Path for FindTBB.cmake +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/resources/cmake/") + ############################################################# ## @@ -36,34 +33,6 @@ set(MSAT_ROOT "" CACHE STRING "The root directory of MathSAT (if available).") set(ADDITIONAL_INCLUDE_DIRS "" CACHE STRING "Additional directories added to the include directories.") set(ADDITIONAL_LINK_DIRS "" CACHE STRING "Additional directories added to the link directories.") set(CUSTOM_BOOST_ROOT "" CACHE STRING "A custom path to the Boost root directory.") -############################################################# -## -## Inclusion of required libraries -## -############################################################# -# Add the resources/cmake folder to Module Search Path for FindTBB.cmake -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/resources/cmake/") - -# Boost Option variables -set(Boost_USE_STATIC_LIBS ON) -set(Boost_USE_MULTITHREADED ON) -set(Boost_USE_STATIC_RUNTIME OFF) - -# If a custom boost root directory was specified, we set the corresponding hint for the script to find it. -if(CUSTOM_BOOST_ROOT) - message(STATUS "StoRM - Using Boost from CUSTOM_BOOST_ROOT located at ${CUSTOM_BOOST_ROOT}") - set(BOOST_ROOT "${CUSTOM_BOOST_ROOT}") -endif(CUSTOM_BOOST_ROOT) - -set(TBB_INSTALL_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/tbb42_20140122_merged-win-lin-mac") - -find_package(Boost REQUIRED) -find_package(Doxygen REQUIRED) -find_package(Gurobi) -find_package(TBB) -find_package(Threads REQUIRED) -find_package(GMP) -find_package(Z3 QUIET) # If the DEBUG option was turned on, we will target a debug version and a release version otherwise. if (STORM_DEBUG) @@ -72,41 +41,13 @@ else() set (CMAKE_BUILD_TYPE "RELEASE") endif() message(STATUS "StoRM - Building ${CMAKE_BUILD_TYPE} version.") +message(STATUS "StoRM - CMAKE_BUILD_TYPE (ENV): $ENV{CMAKE_BUILD_TYPE}") -if ("${GUROBI_ROOT}" STREQUAL "" AND NOT GUROBI_FOUND) - set(ENABLE_GUROBI OFF) -else() - set(ENABLE_GUROBI ON) -endif() - -if ("${CUDA_ROOT}" STREQUAL "") - set(ENABLE_CUDA OFF) -else() - set(ENABLE_CUDA ON) -endif() - - -if ("${MSAT_ROOT}" STREQUAL "") - set(ENABLE_MSAT OFF) -else() - set(ENABLE_MSAT ON) -endif() -if(USE_CARL) - find_package(carl QUIET) - if(carl_FOUND) - set(STORM_HAVE_CARL ON) - endif() - - #find_package(smtrat QUIET) - if(smtrat_FOUND) - set(STORM_HAVE_SMTRAT ON) - endif() -endif() +# Base path for test files +set(STORM_CPP_TESTS_BASE_PATH "${PROJECT_SOURCE_DIR}/test") -message(STATUS "StoRM - CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") -message(STATUS "StoRM - CMAKE_BUILD_TYPE (ENV): $ENV{CMAKE_BUILD_TYPE}") ############################################################# ## @@ -189,77 +130,121 @@ message(STATUS "StoRM - Using Compiler Configuration: ${STORM_COMPILED_BY}") ############################################################# ## -## CMake-generated Config File for StoRM +## Inclusion of required libraries ## ############################################################# -# -# Make a version file containing the current version from git. -# -include(GetGitRevisionDescription) -git_describe_checkout(STORM_GIT_VERSION_STRING) -message(STATUS "STORM_GIT_VERSION_STRING: ${STORM_GIT_VERSION_STRING}") -# Parse the git Tag into variables -string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" STORM_CPP_VERSION_MAJOR "${STORM_GIT_VERSION_STRING}") -string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" STORM_CPP_VERSION_MINOR "${STORM_GIT_VERSION_STRING}") -string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" STORM_CPP_VERSION_PATCH "${STORM_GIT_VERSION_STRING}") -string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+\\-([0-9]+)\\-.*" "\\1" STORM_CPP_VERSION_COMMITS_AHEAD "${STORM_GIT_VERSION_STRING}") -string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+\\-([a-z0-9]+).*" "\\1" STORM_CPP_VERSION_HASH "${STORM_GIT_VERSION_STRING}") -string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+\\-[a-z0-9]+\\-(.*)" "\\1" STORM_CPP_VERSION_APPENDIX "${STORM_GIT_VERSION_STRING}") -if ("${STORM_CPP_VERSION_APPENDIX}" MATCHES "^.*dirty.*$") - set(STORM_CPP_VERSION_DIRTY 1) -else() - set(STORM_CPP_VERSION_DIRTY 0) -endif() -message(STATUS "StoRM - Version information: ${STORM_CPP_VERSION_MAJOR}.${STORM_CPP_VERSION_MINOR}.${STORM_CPP_VERSION_PATCH} (${STORM_CPP_VERSION_COMMITS_AHEAD} commits ahead of Tag) build from ${STORM_CPP_VERSION_HASH} (Dirty: ${STORM_CPP_VERSION_DIRTY})") -# Base path for test files -set(STORM_CPP_TESTS_BASE_PATH "${PROJECT_SOURCE_DIR}/test") -# Gurobi Defines -set(STORM_HAVE_GUROBI ${ENABLE_GUROBI}) +# Add the version of Eigen3 in the repository to the include pathes +set(EIGEN3_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/eigen") +include_directories(${EIGEN3_INCLUDE_DIR}) -# CUDA Defines -if (ENABLE_CUDA) - set(STORM_CPP_CUDA_DEF "define") -else() - set(STORM_CPP_CUDA_DEF "undef") -endif() +# Add the version of GMM in the repository to the include pathes +set(GMMXX_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/gmm-5.0/include") +include_directories(${GMMXX_INCLUDE_DIR}) -# glpk defines -set(STORM_HAVE_GLPK 1) +find_package(GMP) -# CUDA Defines -set(STORM_CPP_CUDAFORSTORM_DEF "undef") + +############################################################# +## +## Boost +## +############################################################# + +# Boost Option variables +set(Boost_USE_STATIC_LIBS ON) +set(Boost_USE_MULTITHREADED ON) +set(Boost_USE_STATIC_RUNTIME OFF) + +# If a custom boost root directory was specified, we set the corresponding hint for the script to find it. +if(CUSTOM_BOOST_ROOT) + message(STATUS "StoRM - Using Boost from CUSTOM_BOOST_ROOT located at ${CUSTOM_BOOST_ROOT}") + set(BOOST_ROOT "${CUSTOM_BOOST_ROOT}") +endif(CUSTOM_BOOST_ROOT) + +find_package(Boost REQUIRED) + +if ((NOT Boost_LIBRARY_DIRS) OR ("${Boost_LIBRARY_DIRS}" STREQUAL "")) + set(Boost_LIBRARY_DIRS "${Boost_INCLUDE_DIRS}/stage/lib") +endif () +link_directories(${Boost_LIBRARY_DIRS}) + + +include_directories(${Boost_INCLUDE_DIRS}) +list(APPEND STORM_LINK_LIBRARIES ${Boost_LIBRARIES}) +#message(STATUS "BOOST_INCLUDE_DIRS is ${Boost_INCLUDE_DIRS}") +#message(STATUS "BOOST_LIBRARY_DIRS is ${Boost_LIBRARY_DIRS}") + + + +############################################################# +## +## ExprTk +## +############################################################# +message (STATUS "StoRM - Including ExprTk") +include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/exprtk") + +############################################################# +## +## Z3 (optional) +## +############################################################# + +find_package(Z3 QUIET) # Z3 Defines set(STORM_HAVE_Z3 ${Z3_FOUND}) -# MathSAT Defines -set(STORM_HAVE_MSAT ${ENABLE_MSAT}) +if(STORM_HAVE_Z3) + message (STATUS "StoRM - Linking with Z3") + include_directories(${Z3_INCLUDE_DIRS}) + list(APPEND STORM_LINK_LIBRARIES ${Z3_LIBRARIES}) +endif(STORM_HAVE_Z3) -# Intel TBB Defines -if (TBB_FOUND AND STORM_USE_INTELTBB) - set(STORM_CPP_INTELTBB_DEF "define") -else() - set(STORM_CPP_INTELTBB_DEF "undef") -endif() -# Configure a header file to pass some of the CMake settings to the source code -configure_file ( - "${PROJECT_SOURCE_DIR}/storm-config.h.in" - "${PROJECT_BINARY_DIR}/include/storm-config.h" -) -# Configure a header file to pass the storm version to the source code -configure_file ( - "${PROJECT_SOURCE_DIR}/storm-version.cpp.in" - "${PROJECT_BINARY_DIR}/src/utility/storm-version.cpp" -) -set(STORM_GENERATED_SOURCES "${PROJECT_BINARY_DIR}/src/utility/storm-version.cpp") +############################################################# +## +## glpk +## +############################################################# + +set(STORM_HAVE_GLPK 1) +message (STATUS "StoRM - Linking with glpk") +add_subdirectory("${PROJECT_SOURCE_DIR}/resources/3rdparty/glpk-4.53") +include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/glpk-4.53/src") +list(APPEND STORM_LINK_LIBRARIES "glpk") + -# Add the binary dir include directory for storm-config.h -include_directories("${PROJECT_BINARY_DIR}/include") + +############################################################# +## +## Gurobi (optional) +## +############################################################# + +find_package(Gurobi) +if ("${GUROBI_ROOT}" STREQUAL "" AND NOT GUROBI_FOUND) + set(ENABLE_GUROBI OFF) +else() + set(ENABLE_GUROBI ON) +endif() + +# Gurobi Defines +set(STORM_HAVE_GUROBI ${ENABLE_GUROBI}) + +if (ENABLE_GUROBI) + if (NOT GUROBI_FOUND) + message(FATAL_ERROR "Gurobi was requested, but not found!") + endif() + message (STATUS "StoRM - Linking with Gurobi (include: ${GUROBI_INCLUDE_DIRS})") + include_directories(${GUROBI_INCLUDE_DIRS}) + list(APPEND STORM_LINK_LIBRARIES ${GUROBI_LIBRARY}) + #link_directories("${GUROBI_ROOT}/lib") +endif() ############################################################# ## @@ -267,6 +252,25 @@ include_directories("${PROJECT_BINARY_DIR}/include") ## ############################################################# + +if ("${CUDA_ROOT}" STREQUAL "") + set(ENABLE_CUDA OFF) +else() + set(ENABLE_CUDA ON) +endif() + +# CUDA Defines +if (ENABLE_CUDA) + set(STORM_CPP_CUDA_DEF "define") +else() + set(STORM_CPP_CUDA_DEF "undef") +endif() + + +# CUDA Defines +set(STORM_CPP_CUDAFORSTORM_DEF "undef") + + if(ENABLE_CUDA) # Test for type alignment @@ -373,166 +377,20 @@ if(ENABLE_CUDA) cuda_add_library(${STORM_CUDA_LIB_NAME} ${STORM_CUDA_KERNEL_FILES} ${STORM_CUDA_HEADER_FILES} ) + + message (STATUS "StoRM - Linking with CUDA") + list(APPEND STORM_LINK_LIBRARIES ${STORM_CUDA_LIB_NAME}) + include_directories("${PROJECT_SOURCE_DIR}/cuda/kernels/") endif() -############################################################# -## -## Source file aggregation and clustering -## -############################################################# -file(GLOB_RECURSE STORM_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h) -file(GLOB_RECURSE STORM_HEADERS_CLI ${PROJECT_SOURCE_DIR}/src/cli/*.h) -file(GLOB_RECURSE STORM_SOURCES_WITHOUT_MAIN ${PROJECT_SOURCE_DIR}/src/*/*.cpp) -file(GLOB_RECURSE STORM_SOURCES_CLI ${PROJECT_SOURCE_DIR}/src/cli/*.cpp) -file(GLOB_RECURSE STORM_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm.cpp) -file(GLOB_RECURSE STORM_ADAPTERS_FILES ${PROJECT_SOURCE_DIR}/src/adapters/*.h ${PROJECT_SOURCE_DIR}/src/adapters/*.cpp) -file(GLOB_RECURSE STORM_BUILDER_FILES ${PROJECT_SOURCE_DIR}/src/builder/*.h ${PROJECT_SOURCE_DIR}/src/builder/*.cpp) -file(GLOB_RECURSE STORM_CLI_FILES ${PROJECT_SOURCE_DIR}/src/cli/*.h ${PROJECT_SOURCE_DIR}/src/cli/*.cpp) -file(GLOB_RECURSE STORM_EXCEPTIONS_FILES ${PROJECT_SOURCE_DIR}/src/exceptions/*.h ${PROJECT_SOURCE_DIR}/src/exceptions/*.cpp) -file(GLOB_RECURSE STORM_LOGIC_FILES ${PROJECT_SOURCE_DIR}/src/logic/*.h ${PROJECT_SOURCE_DIR}/src/logic/*.cpp) -file(GLOB STORM_MODELCHECKER_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/*.cpp) -file(GLOB STORM_MODELCHECKER_PRCTL_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/prctl/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/prctl/*.cpp) -file(GLOB_RECURSE STORM_MODELCHECKER_PRCTL_HELPER_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/prctl/helper/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/prctl/helper/*.cpp) -file(GLOB STORM_MODELCHECKER_CSL_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/csl/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/csl/*.cpp) -file(GLOB_RECURSE STORM_MODELCHECKER_CSL_HELPER_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/csl/helper/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/csl/helper/*.cpp) -file(GLOB_RECURSE STORM_MODELCHECKER_REACHABILITY_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/reachability/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/reachability/*.cpp) -file(GLOB_RECURSE STORM_MODELCHECKER_PROPOSITIONAL_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/propositional/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/propositional/*.cpp) -file(GLOB_RECURSE STORM_MODELCHECKER_RESULTS_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/results/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/results/*.cpp) -file(GLOB_RECURSE STORM_COUNTEREXAMPLES_FILES ${PROJECT_SOURCE_DIR}/src/counterexamples/*.h ${PROJECT_SOURCE_DIR}/src/counterexamples/*.cpp) -file(GLOB_RECURSE STORM_PERMISSIVESCHEDULER_FILES ${PROJECT_SOURCE_DIR}/src/permissivesched/*.h ${PROJECT_SOURCE_DIR}/src/permissivesched/*.cpp) -file(GLOB STORM_MODELS_FILES ${PROJECT_SOURCE_DIR}/src/models/*.h ${PROJECT_SOURCE_DIR}/src/models/*.cpp) -file(GLOB_RECURSE STORM_MODELS_SPARSE_FILES ${PROJECT_SOURCE_DIR}/src/models/sparse/*.h ${PROJECT_SOURCE_DIR}/src/models/sparse/*.cpp) -file(GLOB_RECURSE STORM_MODELS_SYMBOLIC_FILES ${PROJECT_SOURCE_DIR}/src/models/symbolic/*.h ${PROJECT_SOURCE_DIR}/src/models/symbolic/*.cpp) -file(GLOB STORM_PARSER_FILES ${PROJECT_SOURCE_DIR}/src/parser/*.h ${PROJECT_SOURCE_DIR}/src/parser/*.cpp) -file(GLOB_RECURSE STORM_PARSER_PRISMPARSER_FILES ${PROJECT_SOURCE_DIR}/src/parser/prismparser/*.h ${PROJECT_SOURCE_DIR}/src/parser/prismparser/*.cpp) -file(GLOB STORM_SETTINGS_FILES ${PROJECT_SOURCE_DIR}/src/settings/*.h ${PROJECT_SOURCE_DIR}/src/settings/*.cpp) -file(GLOB STORM_SETTINGS_MODULES_FILES ${PROJECT_SOURCE_DIR}/src/settings/modules/*.h ${PROJECT_SOURCE_DIR}/src/settings/modules/*.cpp) -file(GLOB_RECURSE STORM_SOLVER_FILES ${PROJECT_SOURCE_DIR}/src/solver/*.h ${PROJECT_SOURCE_DIR}/src/solver/*.cpp) -file(GLOB STORM_STORAGE_FILES ${PROJECT_SOURCE_DIR}/src/storage/*.h ${PROJECT_SOURCE_DIR}/src/storage/*.cpp) -file(GLOB_RECURSE STORM_STORAGE_DD_FILES ${PROJECT_SOURCE_DIR}/src/storage/dd/*.h ${PROJECT_SOURCE_DIR}/src/storage/dd/*.cpp) -file(GLOB_RECURSE STORM_STORAGE_EXPRESSIONS_FILES ${PROJECT_SOURCE_DIR}/src/storage/expressions/*.h ${PROJECT_SOURCE_DIR}/src/storage/expressions/*.cpp) -file(GLOB_RECURSE STORM_STORAGE_PRISM_FILES ${PROJECT_SOURCE_DIR}/src/storage/prism/*.h ${PROJECT_SOURCE_DIR}/src/storage/prism/*.cpp) -file(GLOB_RECURSE STORM_STORAGE_SPARSE_FILES ${PROJECT_SOURCE_DIR}/src/storage/sparse/*.h ${PROJECT_SOURCE_DIR}/src/storage/sparse/*.cpp) -file(GLOB_RECURSE STORM_UTILITY_FILES ${PROJECT_SOURCE_DIR}/src/utility/*.h ${PROJECT_SOURCE_DIR}/src/utility/*.cpp) -# Test Sources -# Note that the tests also need the source files, except for the main file -file(GLOB STORM_FUNCTIONAL_TEST_MAIN_FILE ${STORM_CPP_TESTS_BASE_PATH}/functional/storm-functional-tests.cpp) -file(GLOB_RECURSE STORM_FUNCTIONAL_TEST_FILES ${STORM_CPP_TESTS_BASE_PATH}/functional/*.h ${STORM_CPP_TESTS_BASE_PATH}/functional/*.cpp) -file(GLOB STORM_PERFORMANCE_TEST_MAIN_FILE ${STORM_CPP_TESTS_BASE_PATH}/performance/storm-performance-tests.cpp) -file(GLOB_RECURSE STORM_PERFORMANCE_TEST_FILES ${STORM_CPP_TESTS_BASE_PATH}/performance/*.h ${STORM_CPP_TESTS_BASE_PATH}/performance/*.cpp) - -# Additional include files like the storm-config.h -file(GLOB_RECURSE STORM_BUILD_HEADERS ${PROJECT_BINARY_DIR}/include/*.h) - -set(STORM_LIB_SOURCES ${STORM_SOURCES_WITHOUT_MAIN}) -list(REMOVE_ITEM STORM_LIB_SOURCES ${STORM_SOURCES_CLI}) -set(STORM_LIB_HEADERS ${STORM_HEADERS}) -list(REMOVE_ITEM STORM_LIB_HEADERS ${STORM_HEADERS_CLI}) -set(STORM_MAIN_SOURCES ${STORM_SOURCES_CLI} ${STORM_MAIN_FILE}) -set(STORM_MAIN_HEADERS ${STORM_HEADERS_CLI}) - -# Group the headers and sources -source_group(main FILES ${STORM_MAIN_FILE}) -source_group(adapters FILES ${STORM_ADAPTERS_FILES}) -source_group(builder FILES ${STORM_BUILDER_FILES}) -source_group(cli FILES ${STORM_CLI_FILES}) -source_group(exceptions FILES ${STORM_EXCEPTIONS_FILES}) -source_group(logic FILES ${STORM_LOGIC_FILES}) -source_group(generated FILES ${STORM_BUILD_HEADERS} ${STORM_BUILD_SOURCES}) -source_group(modelchecker FILES ${STORM_MODELCHECKER_FILES}) -source_group(modelchecker\\prctl FILES ${STORM_MODELCHECKER_PRCTL_FILES}) -source_group(modelchecker\\prctl\\helper FILES ${STORM_MODELCHECKER_PRCTL_HELPER_FILES}) -source_group(modelchecker\\csl FILES ${STORM_MODELCHECKER_CSL_FILES}) -source_group(modelchecker\\csl\\helper FILES ${STORM_MODELCHECKER_CSL_HELPER_FILES}) -source_group(modelchecker\\reachability FILES ${STORM_MODELCHECKER_REACHABILITY_FILES}) -source_group(modelchecker\\propositional FILES ${STORM_MODELCHECKER_PROPOSITIONAL_FILES}) -source_group(modelchecker\\results FILES ${STORM_MODELCHECKER_RESULTS_FILES}) -source_group(counterexamples FILES ${STORM_COUNTEREXAMPLES_FILES}) -source_group(permissiveschedulers FILES ${STORM_PERMISSIVESCHEDULER_FILES}) -source_group(models FILES ${STORM_MODELS_FILES}) -source_group(models\\sparse FILES ${STORM_MODELS_SPARSE_FILES}) -source_group(models\\symbolic FILES ${STORM_MODELS_SYMBOLIC_FILES}) -source_group(parser FILES ${STORM_PARSER_FILES}) -source_group(parser\\prismparser FILES ${STORM_PARSER_PRISMPARSER_FILES}) -source_group(settings FILES ${STORM_SETTINGS_FILES}) -source_group(settings\\modules FILES ${STORM_SETTINGS_MODULES_FILES}) -source_group(solver FILES ${STORM_SOLVER_FILES}) -source_group(storage FILES ${STORM_STORAGE_FILES}) -source_group(storage\\dd FILES ${STORM_STORAGE_DD_FILES}) -source_group(storage\\expressions FILES ${STORM_STORAGE_EXPRESSIONS_FILES}) -source_group(storage\\prism FILES ${STORM_STORAGE_PRISM_FILES}) -source_group(storage\\sparse FILES ${STORM_STORAGE_SPARSE_FILES}) -source_group(utility FILES ${STORM_UTILITY_FILES}) -source_group(functional-test FILES ${STORM_FUNCTIONAL_TEST_FILES}) -source_group(performance-test FILES ${STORM_PERFORMANCE_TEST_FILES} ${}) - -# Add custom additional include or link directories -if (ADDITIONAL_INCLUDE_DIRS) - message(STATUS "StoRM - Using additional include directories ${ADDITIONAL_INCLUDE_DIRS}") - include_directories(${ADDITIONAL_INCLUDE_DIRS}) -endif(ADDITIONAL_INCLUDE_DIRS) -if (ADDITIONAL_LINK_DIRS) - message(STATUS "StoRM - Using additional link directories ${ADDITIONAL_LINK_DIRS}") - link_directories(${ADDITIONAL_LINK_DIRS}) -endif(ADDITIONAL_LINK_DIRS) -############################################################# -## -## Pre executable-creation link_directories setup -## -############################################################# -if (ENABLE_GUROBI) - if (NOT GUROBI_FOUND) - message(FATAL_ERROR "Gurobi was requested, but not found!") - endif() - #link_directories("${GUROBI_ROOT}/lib") -endif() -if (ENABLE_MSAT) - link_directories("${MSAT_ROOT}/lib") -endif() if(GMP_FOUND) link_directories(${GMP_LIBRARY_DIR}) elseif(MPIR_FOUND) link_directories(${GMP_MPIR_LIBRARY_DIR} ${GMP_MPIRXX_LIBRARY_DIR}) -else(GMP_FOUND) - if (ENABLE_MSAT) - message(FATAL_ERROR "GMP is required for MathSAT, but was not found!") - endif(ENABLE_MSAT) endif(GMP_FOUND) -if ((NOT Boost_LIBRARY_DIRS) OR ("${Boost_LIBRARY_DIRS}" STREQUAL "")) - set(Boost_LIBRARY_DIRS "${Boost_INCLUDE_DIRS}/stage/lib") -endif () -link_directories(${Boost_LIBRARY_DIRS}) -if (TBB_FOUND AND STORM_USE_INTELTBB) - link_directories(${TBB_LIBRARY_DIRS}) -endif() -############################################################################### -## # -## Executable Creation # -## # -## All link_directories() calls MUST be made before this point # -## # -############################################################################### -add_library(storm ${STORM_LIB_SOURCES} ${STORM_LIB_HEADERS} ${STORM_GENERATED_SOURCES}) # Adding headers for xcode -add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS}) -target_link_libraries(storm-main storm) # Adding headers for xcode -set_target_properties(storm-main PROPERTIES OUTPUT_NAME "storm") -add_executable(storm-functional-tests ${STORM_FUNCTIONAL_TEST_MAIN_FILE} ${STORM_FUNCTIONAL_TEST_FILES}) -target_link_libraries(storm-functional-tests storm) -add_executable(storm-performance-tests ${STORM_PERFORMANCE_TEST_MAIN_FILE} ${STORM_PERFORMANCE_TEST_FILES}) -target_link_libraries(storm-performance-tests storm) - -############################################################# -## -## Boost -## -############################################################# -include_directories(${Boost_INCLUDE_DIRS}) -target_link_libraries(storm ${Boost_LIBRARIES}) -#message(STATUS "BOOST_INCLUDE_DIRS is ${Boost_INCLUDE_DIRS}") -#message(STATUS "BOOST_LIBRARY_DIRS is ${Boost_LIBRARY_DIRS}") ############################################################# ## @@ -547,70 +405,34 @@ include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0/src/nan include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0/src/obj") include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0/src/st") include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/cudd-2.5.0/src/util") -target_link_libraries(storm cudd) +list(APPEND STORM_LINK_LIBRARIES cudd) -############################################################# -## -## Gurobi (optional) -## -############################################################# -if (ENABLE_GUROBI) - message (STATUS "StoRM - Linking with Gurobi (include: ${GUROBI_INCLUDE_DIRS})") - include_directories(${GUROBI_INCLUDE_DIRS}) - target_link_libraries(storm ${GUROBI_LIBRARY}) -endif(ENABLE_GUROBI) -############################################################# -## -## CUDA (optional) -## -############################################################# -if (ENABLE_CUDA) - message (STATUS "StoRM - Linking with CUDA") - target_link_libraries(storm ${STORM_CUDA_LIB_NAME}) - include_directories("${PROJECT_SOURCE_DIR}/cuda/kernels/") -endif(ENABLE_CUDA) -############################################################# -## -## glpk -## -############################################################# -message (STATUS "StoRM - Linking with glpk") -add_subdirectory("${PROJECT_SOURCE_DIR}/resources/3rdparty/glpk-4.53") -include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/glpk-4.53/src") -target_link_libraries(storm "glpk") -############################################################# -## -## ExprTk -## -############################################################# -message (STATUS "StoRM - Including ExprTk") -include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/exprtk") ############################################################# ## -## Z3 (optional) +## carl ## ############################################################# -if(STORM_HAVE_Z3) - message (STATUS "StoRM - Linking with Z3") - include_directories(${Z3_INCLUDE_DIRS}) - target_link_libraries(storm ${Z3_LIBRARIES}) -endif(STORM_HAVE_Z3) +if(USE_CARL) + find_package(carl QUIET) + if(carl_FOUND) + set(STORM_HAVE_CARL ON) + endif() -############################################################# -## -## carl -## -############################################################# + #find_package(smtrat QUIET) + if(smtrat_FOUND) + set(STORM_HAVE_SMTRAT ON) + endif() +endif() if(STORM_HAVE_CARL) message(STATUS "StoRM - Linking with carl.") include_directories("${carl_INCLUDE_DIR}") - target_link_libraries(storm ${carl_LIBRARIES}) + list(APPEND STORM_LINK_LIBRARIES ${carl_LIBRARIES}) endif() ############################################################# @@ -622,7 +444,7 @@ endif() if(STORM_HAVE_SMTRAT) message(STATUS "StoRM - Linking with smtrat.") include_directories("${smtrat_INCLUDE_DIR}") - target_link_libraries(storm ${smtrat_LIBRARIES}) + list(APPEND STORM_LINK_LIBRARIES ${smtrat_LIBRARIES}) endif() ############################################################# @@ -630,16 +452,28 @@ endif() ## MathSAT (optional) ## ############################################################# + + + +if ("${MSAT_ROOT}" STREQUAL "") + set(ENABLE_MSAT OFF) +else() + set(ENABLE_MSAT ON) +endif() + +# MathSAT Defines +set(STORM_HAVE_MSAT ${ENABLE_MSAT}) if (ENABLE_MSAT) + link_directories("${MSAT_ROOT}/lib") message (STATUS "StoRM - Linking with MathSAT") include_directories("${MSAT_ROOT}/include") - target_link_libraries(storm "mathsat") + list(APPEND STORM_LINK_LIBRARIES "mathsat") if(GMP_FOUND) include_directories("${GMP_INCLUDE_DIR}") - target_link_libraries(storm "gmp") + list(APPEND STORM_LINK_LIBRARIES "gmp") elseif(MPIR_FOUND) include_directories("${GMP_INCLUDE_DIR}") - target_link_libraries(storm "mpir" "mpirxx") + list(APPEND STORM_LINK_LIBRARIES "mpir" "mpirxx") else(GMP_FOUND) message(FATAL_ERROR "GMP is required for MathSAT, but was not found!") endif(GMP_FOUND) @@ -650,14 +484,9 @@ endif(ENABLE_MSAT) ## Google Test gtest ## ############################################################# + set(gtest_force_shared_crt ON) add_subdirectory("${PROJECT_SOURCE_DIR}/resources/3rdparty/gtest-1.7.0") -include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/gtest-1.7.0/include") -enable_testing() -target_link_libraries(storm-functional-tests gtest) -target_link_libraries(storm-performance-tests gtest) -add_test(NAME storm-functional-tests COMMAND storm-functional-tests) -add_test(NAME storm-performance-tests COMMAND storm-performance-tests) ############################################################# ## @@ -672,14 +501,10 @@ set(LOG4CPLUS_DEFINE_INSTALL_TARGET OFF) add_subdirectory("${PROJECT_SOURCE_DIR}/resources/3rdparty/log4cplus-1.1.3-rc1") include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/log4cplus-1.1.3-rc1/include") include_directories("${PROJECT_BINARY_DIR}/resources/3rdparty/log4cplus-1.1.3-rc1/include") # This adds the defines.hxx file -target_link_libraries(storm log4cplusS) -target_link_libraries(storm-functional-tests log4cplusS) -target_link_libraries(storm-performance-tests log4cplusS) + +list(APPEND STORM_LINK_LIBRARIES log4cplusS) if (UNIX AND NOT APPLE) - target_link_libraries(storm rt) - if (STORM_USE_COTIRE) - target_link_libraries(storm_unity rt) - endif(STORM_USE_COTIRE) + list(APPEND STORM_LINK_LIBRARIES rt) endif(UNIX AND NOT APPLE) ############################################################# @@ -687,6 +512,19 @@ endif(UNIX AND NOT APPLE) ## Intel Threading Building Blocks (optional) ## ############################################################# + +set(TBB_INSTALL_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/tbb42_20140122_merged-win-lin-mac") + + +find_package(TBB) +if (TBB_FOUND AND STORM_USE_INTELTBB) + link_directories(${TBB_LIBRARY_DIRS}) + set(STORM_CPP_INTELTBB_DEF "define") +else() + set(STORM_CPP_INTELTBB_DEF "undef") +endif() + + if (TBB_FOUND) message(STATUS "StoRM - Found Intel TBB with interface version ${TBB_INTERFACE_VERSION}.") if (STORM_USE_INTELTBB) @@ -701,8 +539,10 @@ endif(TBB_FOUND) ## Threads ## ############################################################# + +find_package(Threads REQUIRED) include_directories(${THREADS_INCLUDE_DIRS}) -target_link_libraries(storm ${CMAKE_THREAD_LIBS_INIT}) +list(APPEND STORM_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) if (STORM_USE_COTIRE) target_link_libraries(storm_unity ${CMAKE_THREAD_LIBS_INIT}) endif(STORM_USE_COTIRE) @@ -749,6 +589,8 @@ endif(LINK_LIBCXXABI) ## Doxygen ## ############################################################# + +find_package(Doxygen REQUIRED) # Add a target to generate API documentation with Doxygen if(DOXYGEN_FOUND) set(CMAKE_DOXYGEN_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc") @@ -759,6 +601,55 @@ if(DOXYGEN_FOUND) add_custom_target(doc ${DOXYGEN_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" COMMENT "Generating API documentation with Doxygen" VERBATIM) endif(DOXYGEN_FOUND) + +############################################################# +## +## CMake-generated Config File for StoRM +## +############################################################# + +# +# Make a version file containing the current version from git. +# +include(GetGitRevisionDescription) +git_describe_checkout(STORM_GIT_VERSION_STRING) +message(STATUS "STORM_GIT_VERSION_STRING: ${STORM_GIT_VERSION_STRING}") +# Parse the git Tag into variables +string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" STORM_CPP_VERSION_MAJOR "${STORM_GIT_VERSION_STRING}") +string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" STORM_CPP_VERSION_MINOR "${STORM_GIT_VERSION_STRING}") +string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" STORM_CPP_VERSION_PATCH "${STORM_GIT_VERSION_STRING}") +string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+\\-([0-9]+)\\-.*" "\\1" STORM_CPP_VERSION_COMMITS_AHEAD "${STORM_GIT_VERSION_STRING}") +string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+\\-([a-z0-9]+).*" "\\1" STORM_CPP_VERSION_HASH "${STORM_GIT_VERSION_STRING}") +string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+\\-[a-z0-9]+\\-(.*)" "\\1" STORM_CPP_VERSION_APPENDIX "${STORM_GIT_VERSION_STRING}") +if ("${STORM_CPP_VERSION_APPENDIX}" MATCHES "^.*dirty.*$") + set(STORM_CPP_VERSION_DIRTY 1) +else() + set(STORM_CPP_VERSION_DIRTY 0) +endif() +message(STATUS "StoRM - Version information: ${STORM_CPP_VERSION_MAJOR}.${STORM_CPP_VERSION_MINOR}.${STORM_CPP_VERSION_PATCH} (${STORM_CPP_VERSION_COMMITS_AHEAD} commits ahead of Tag) build from ${STORM_CPP_VERSION_HASH} (Dirty: ${STORM_CPP_VERSION_DIRTY})") + +# Configure a header file to pass some of the CMake settings to the source code +configure_file ( + "${PROJECT_SOURCE_DIR}/storm-config.h.in" + "${PROJECT_BINARY_DIR}/include/storm-config.h" +) + +# Configure a header file to pass the storm version to the source code +configure_file ( + "${PROJECT_SOURCE_DIR}/storm-version.cpp.in" + "${PROJECT_BINARY_DIR}/src/utility/storm-version.cpp" +) + +set(STORM_GENERATED_SOURCES "${PROJECT_BINARY_DIR}/src/utility/storm-version.cpp") + +# Add the binary dir include directory for storm-config.h +include_directories("${PROJECT_BINARY_DIR}/include") + +add_subdirectory(src) +add_subdirectory(test) + + + ############################################################# ## ## memcheck targets @@ -771,9 +662,5 @@ add_custom_target(memcheck-performance-tests valgrind --leak-check=full --show-r set(CPPLINT_ARGS --filter=-whitespace/tab,-whitespace/line_length,-legal/copyright,-readability/streams) add_custom_target(style python cpplint.py ${CPPLINT_ARGS} `find ./src/ -iname "*.h" -or -iname "*.cpp" `) -INSTALL(TARGETS storm-main storm-functional-tests storm-performance-tests - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) + include(StormCPackConfig.cmake) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 000000000..454fe8262 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,117 @@ + +############################################################# +## +## Source file aggregation and clustering +## +############################################################# +file(GLOB_RECURSE STORM_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h) +file(GLOB_RECURSE STORM_HEADERS_CLI ${PROJECT_SOURCE_DIR}/src/cli/*.h) +file(GLOB_RECURSE STORM_SOURCES_WITHOUT_MAIN ${PROJECT_SOURCE_DIR}/src/*/*.cpp) +file(GLOB_RECURSE STORM_SOURCES_CLI ${PROJECT_SOURCE_DIR}/src/cli/*.cpp) +file(GLOB_RECURSE STORM_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm.cpp) +file(GLOB_RECURSE STORM_ADAPTERS_FILES ${PROJECT_SOURCE_DIR}/src/adapters/*.h ${PROJECT_SOURCE_DIR}/src/adapters/*.cpp) +file(GLOB_RECURSE STORM_BUILDER_FILES ${PROJECT_SOURCE_DIR}/src/builder/*.h ${PROJECT_SOURCE_DIR}/src/builder/*.cpp) +file(GLOB_RECURSE STORM_CLI_FILES ${PROJECT_SOURCE_DIR}/src/cli/*.h ${PROJECT_SOURCE_DIR}/src/cli/*.cpp) +file(GLOB_RECURSE STORM_EXCEPTIONS_FILES ${PROJECT_SOURCE_DIR}/src/exceptions/*.h ${PROJECT_SOURCE_DIR}/src/exceptions/*.cpp) +file(GLOB_RECURSE STORM_LOGIC_FILES ${PROJECT_SOURCE_DIR}/src/logic/*.h ${PROJECT_SOURCE_DIR}/src/logic/*.cpp) +file(GLOB STORM_MODELCHECKER_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/*.cpp) +file(GLOB STORM_MODELCHECKER_PRCTL_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/prctl/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/prctl/*.cpp) +file(GLOB_RECURSE STORM_MODELCHECKER_PRCTL_HELPER_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/prctl/helper/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/prctl/helper/*.cpp) +file(GLOB STORM_MODELCHECKER_CSL_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/csl/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/csl/*.cpp) +file(GLOB_RECURSE STORM_MODELCHECKER_CSL_HELPER_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/csl/helper/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/csl/helper/*.cpp) +file(GLOB_RECURSE STORM_MODELCHECKER_REACHABILITY_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/reachability/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/reachability/*.cpp) +file(GLOB_RECURSE STORM_MODELCHECKER_PROPOSITIONAL_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/propositional/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/propositional/*.cpp) +file(GLOB_RECURSE STORM_MODELCHECKER_RESULTS_FILES ${PROJECT_SOURCE_DIR}/src/modelchecker/results/*.h ${PROJECT_SOURCE_DIR}/src/modelchecker/results/*.cpp) +file(GLOB_RECURSE STORM_COUNTEREXAMPLES_FILES ${PROJECT_SOURCE_DIR}/src/counterexamples/*.h ${PROJECT_SOURCE_DIR}/src/counterexamples/*.cpp) +file(GLOB_RECURSE STORM_PERMISSIVESCHEDULER_FILES ${PROJECT_SOURCE_DIR}/src/permissivesched/*.h ${PROJECT_SOURCE_DIR}/src/permissivesched/*.cpp) +file(GLOB STORM_MODELS_FILES ${PROJECT_SOURCE_DIR}/src/models/*.h ${PROJECT_SOURCE_DIR}/src/models/*.cpp) +file(GLOB_RECURSE STORM_MODELS_SPARSE_FILES ${PROJECT_SOURCE_DIR}/src/models/sparse/*.h ${PROJECT_SOURCE_DIR}/src/models/sparse/*.cpp) +file(GLOB_RECURSE STORM_MODELS_SYMBOLIC_FILES ${PROJECT_SOURCE_DIR}/src/models/symbolic/*.h ${PROJECT_SOURCE_DIR}/src/models/symbolic/*.cpp) +file(GLOB STORM_PARSER_FILES ${PROJECT_SOURCE_DIR}/src/parser/*.h ${PROJECT_SOURCE_DIR}/src/parser/*.cpp) +file(GLOB_RECURSE STORM_PARSER_PRISMPARSER_FILES ${PROJECT_SOURCE_DIR}/src/parser/prismparser/*.h ${PROJECT_SOURCE_DIR}/src/parser/prismparser/*.cpp) +file(GLOB STORM_SETTINGS_FILES ${PROJECT_SOURCE_DIR}/src/settings/*.h ${PROJECT_SOURCE_DIR}/src/settings/*.cpp) +file(GLOB STORM_SETTINGS_MODULES_FILES ${PROJECT_SOURCE_DIR}/src/settings/modules/*.h ${PROJECT_SOURCE_DIR}/src/settings/modules/*.cpp) +file(GLOB_RECURSE STORM_SOLVER_FILES ${PROJECT_SOURCE_DIR}/src/solver/*.h ${PROJECT_SOURCE_DIR}/src/solver/*.cpp) +file(GLOB STORM_STORAGE_FILES ${PROJECT_SOURCE_DIR}/src/storage/*.h ${PROJECT_SOURCE_DIR}/src/storage/*.cpp) +file(GLOB_RECURSE STORM_STORAGE_DD_FILES ${PROJECT_SOURCE_DIR}/src/storage/dd/*.h ${PROJECT_SOURCE_DIR}/src/storage/dd/*.cpp) +file(GLOB_RECURSE STORM_STORAGE_EXPRESSIONS_FILES ${PROJECT_SOURCE_DIR}/src/storage/expressions/*.h ${PROJECT_SOURCE_DIR}/src/storage/expressions/*.cpp) +file(GLOB_RECURSE STORM_STORAGE_PRISM_FILES ${PROJECT_SOURCE_DIR}/src/storage/prism/*.h ${PROJECT_SOURCE_DIR}/src/storage/prism/*.cpp) +file(GLOB_RECURSE STORM_STORAGE_SPARSE_FILES ${PROJECT_SOURCE_DIR}/src/storage/sparse/*.h ${PROJECT_SOURCE_DIR}/src/storage/sparse/*.cpp) +file(GLOB_RECURSE STORM_UTILITY_FILES ${PROJECT_SOURCE_DIR}/src/utility/*.h ${PROJECT_SOURCE_DIR}/src/utility/*.cpp) + + +# Additional include files like the storm-config.h +file(GLOB_RECURSE STORM_BUILD_HEADERS ${PROJECT_BINARY_DIR}/include/*.h) + +set(STORM_LIB_SOURCES ${STORM_SOURCES_WITHOUT_MAIN}) +list(REMOVE_ITEM STORM_LIB_SOURCES ${STORM_SOURCES_CLI}) +set(STORM_LIB_HEADERS ${STORM_HEADERS}) +list(REMOVE_ITEM STORM_LIB_HEADERS ${STORM_HEADERS_CLI}) +set(STORM_MAIN_SOURCES ${STORM_SOURCES_CLI} ${STORM_MAIN_FILE}) +set(STORM_MAIN_HEADERS ${STORM_HEADERS_CLI}) + +# Group the headers and sources +source_group(main FILES ${STORM_MAIN_FILE}) +source_group(adapters FILES ${STORM_ADAPTERS_FILES}) +source_group(builder FILES ${STORM_BUILDER_FILES}) +source_group(cli FILES ${STORM_CLI_FILES}) +source_group(exceptions FILES ${STORM_EXCEPTIONS_FILES}) +source_group(logic FILES ${STORM_LOGIC_FILES}) +source_group(generated FILES ${STORM_BUILD_HEADERS} ${STORM_BUILD_SOURCES}) +source_group(modelchecker FILES ${STORM_MODELCHECKER_FILES}) +source_group(modelchecker\\prctl FILES ${STORM_MODELCHECKER_PRCTL_FILES}) +source_group(modelchecker\\prctl\\helper FILES ${STORM_MODELCHECKER_PRCTL_HELPER_FILES}) +source_group(modelchecker\\csl FILES ${STORM_MODELCHECKER_CSL_FILES}) +source_group(modelchecker\\csl\\helper FILES ${STORM_MODELCHECKER_CSL_HELPER_FILES}) +source_group(modelchecker\\reachability FILES ${STORM_MODELCHECKER_REACHABILITY_FILES}) +source_group(modelchecker\\propositional FILES ${STORM_MODELCHECKER_PROPOSITIONAL_FILES}) +source_group(modelchecker\\results FILES ${STORM_MODELCHECKER_RESULTS_FILES}) +source_group(counterexamples FILES ${STORM_COUNTEREXAMPLES_FILES}) +source_group(permissiveschedulers FILES ${STORM_PERMISSIVESCHEDULER_FILES}) +source_group(models FILES ${STORM_MODELS_FILES}) +source_group(models\\sparse FILES ${STORM_MODELS_SPARSE_FILES}) +source_group(models\\symbolic FILES ${STORM_MODELS_SYMBOLIC_FILES}) +source_group(parser FILES ${STORM_PARSER_FILES}) +source_group(parser\\prismparser FILES ${STORM_PARSER_PRISMPARSER_FILES}) +source_group(settings FILES ${STORM_SETTINGS_FILES}) +source_group(settings\\modules FILES ${STORM_SETTINGS_MODULES_FILES}) +source_group(solver FILES ${STORM_SOLVER_FILES}) +source_group(storage FILES ${STORM_STORAGE_FILES}) +source_group(storage\\dd FILES ${STORM_STORAGE_DD_FILES}) +source_group(storage\\expressions FILES ${STORM_STORAGE_EXPRESSIONS_FILES}) +source_group(storage\\prism FILES ${STORM_STORAGE_PRISM_FILES}) +source_group(storage\\sparse FILES ${STORM_STORAGE_SPARSE_FILES}) +source_group(utility FILES ${STORM_UTILITY_FILES}) + +# Add custom additional include or link directories +if (ADDITIONAL_INCLUDE_DIRS) + message(STATUS "StoRM - Using additional include directories ${ADDITIONAL_INCLUDE_DIRS}") + include_directories(${ADDITIONAL_INCLUDE_DIRS}) +endif(ADDITIONAL_INCLUDE_DIRS) +if (ADDITIONAL_LINK_DIRS) + message(STATUS "StoRM - Using additional link directories ${ADDITIONAL_LINK_DIRS}") + link_directories(${ADDITIONAL_LINK_DIRS}) +endif(ADDITIONAL_LINK_DIRS) + +############################################################################### +## # +## Executable Creation # +## # +## All link_directories() calls MUST be made before this point # +## # +############################################################################### +add_library(storm ${STORM_LIB_SOURCES} ${STORM_LIB_HEADERS} ${STORM_GENERATED_SOURCES}) # Adding headers for xcode +add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS}) +target_link_libraries(storm-main storm) # Adding headers for xcode +set_target_properties(storm-main PROPERTIES OUTPUT_NAME "storm") + + +target_link_libraries(storm ${STORM_LINK_LIBRARIES}) + + + +INSTALL(TARGETS storm-main + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 000000000..42771c858 --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,27 @@ +# Test Sources +# Note that the tests also need the source files, except for the main file +file(GLOB STORM_FUNCTIONAL_TEST_MAIN_FILE ${STORM_CPP_TESTS_BASE_PATH}/functional/storm-functional-tests.cpp) +file(GLOB_RECURSE STORM_FUNCTIONAL_TEST_FILES ${STORM_CPP_TESTS_BASE_PATH}/functional/*.h ${STORM_CPP_TESTS_BASE_PATH}/functional/*.cpp) +file(GLOB STORM_PERFORMANCE_TEST_MAIN_FILE ${STORM_CPP_TESTS_BASE_PATH}/performance/storm-performance-tests.cpp) +file(GLOB_RECURSE STORM_PERFORMANCE_TEST_FILES ${STORM_CPP_TESTS_BASE_PATH}/performance/*.h ${STORM_CPP_TESTS_BASE_PATH}/performance/*.cpp) + +source_group(functional-test FILES ${STORM_FUNCTIONAL_TEST_FILES}) +source_group(performance-test FILES ${STORM_PERFORMANCE_TEST_FILES} ${}) + +add_executable(storm-functional-tests ${STORM_FUNCTIONAL_TEST_MAIN_FILE} ${STORM_FUNCTIONAL_TEST_FILES}) +target_link_libraries(storm-functional-tests storm) +add_executable(storm-performance-tests ${STORM_PERFORMANCE_TEST_MAIN_FILE} ${STORM_PERFORMANCE_TEST_FILES}) +target_link_libraries(storm-performance-tests storm) + +include_directories("${PROJECT_SOURCE_DIR}/resources/3rdparty/gtest-1.7.0/include") +enable_testing() +target_link_libraries(storm-functional-tests gtest) +target_link_libraries(storm-performance-tests gtest) +add_test(NAME storm-functional-tests COMMAND storm-functional-tests) +add_test(NAME storm-performance-tests COMMAND storm-performance-tests) + +INSTALL(TARGETS storm-functional-tests storm-performance-tests + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) \ No newline at end of file