From 07fe0a8e3a4153ef031f4923dc2f1d6c4e74d25d Mon Sep 17 00:00:00 2001 From: Sebastian Junges Date: Thu, 3 Aug 2017 17:41:37 +0200 Subject: [PATCH] new target: binaries, compiles all the storm binaries, but not the tests etc --- src/CMakeLists.txt | 4 ++++ src/storm-dft-cli/CMakeLists.txt | 2 ++ src/storm-gspn-cli/CMakeLists.txt | 2 ++ src/storm-pars-cli/CMakeLists.txt | 2 ++ src/storm/CMakeLists.txt | 2 ++ 5 files changed, 12 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e9059930d..38b884cf7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,6 +2,8 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +add_custom_target(binaries) + add_subdirectory(storm) add_subdirectory(storm-pgcl) add_subdirectory(storm-pgcl-cli) @@ -12,6 +14,8 @@ add_subdirectory(storm-dft-cli) add_subdirectory(storm-pars) add_subdirectory(storm-pars-cli) + + add_subdirectory(test) set(STORM_TARGETS ${STORM_TARGETS} PARENT_SCOPE) diff --git a/src/storm-dft-cli/CMakeLists.txt b/src/storm-dft-cli/CMakeLists.txt index 515022607..0d104405e 100644 --- a/src/storm-dft-cli/CMakeLists.txt +++ b/src/storm-dft-cli/CMakeLists.txt @@ -3,5 +3,7 @@ add_executable(storm-dft-cli ${PROJECT_SOURCE_DIR}/src/storm-dft-cli/storm-dyfte target_link_libraries(storm-dft-cli storm-dft) # Adding headers for xcode set_target_properties(storm-dft-cli PROPERTIES OUTPUT_NAME "storm-dft") +add_dependencies(binaries storm-dft-cli) + # installation install(TARGETS storm-dft-cli RUNTIME DESTINATION bin LIBRARY DESTINATION lib OPTIONAL) \ No newline at end of file diff --git a/src/storm-gspn-cli/CMakeLists.txt b/src/storm-gspn-cli/CMakeLists.txt index 2898325f3..72e51a6da 100644 --- a/src/storm-gspn-cli/CMakeLists.txt +++ b/src/storm-gspn-cli/CMakeLists.txt @@ -2,5 +2,7 @@ add_executable(storm-gspn-cli ${PROJECT_SOURCE_DIR}/src/storm-gspn-cli/storm-gsp target_link_libraries(storm-gspn-cli storm-gspn) # Adding headers for xcode set_target_properties(storm-gspn-cli PROPERTIES OUTPUT_NAME "storm-gspn") +add_dependencies(binaries storm-gspn-cli) + # installation install(TARGETS storm-gspn-cli RUNTIME DESTINATION bin LIBRARY DESTINATION lib OPTIONAL) \ No newline at end of file diff --git a/src/storm-pars-cli/CMakeLists.txt b/src/storm-pars-cli/CMakeLists.txt index 9cd155e35..bda5ad6c2 100644 --- a/src/storm-pars-cli/CMakeLists.txt +++ b/src/storm-pars-cli/CMakeLists.txt @@ -3,5 +3,7 @@ add_executable(storm-pars-cli ${PROJECT_SOURCE_DIR}/src/storm-pars-cli/storm-par target_link_libraries(storm-pars-cli storm-pars) # Adding headers for xcode set_target_properties(storm-pars-cli PROPERTIES OUTPUT_NAME "storm-pars") +add_dependencies(binaries storm-pars-cli) + # installation install(TARGETS storm-pars-cli RUNTIME DESTINATION bin LIBRARY DESTINATION lib OPTIONAL) diff --git a/src/storm/CMakeLists.txt b/src/storm/CMakeLists.txt index a57805ed9..193a6d4bb 100644 --- a/src/storm/CMakeLists.txt +++ b/src/storm/CMakeLists.txt @@ -69,6 +69,8 @@ add_custom_target(copy_storm_headers DEPENDS ${STORM_OUTPUT_HEADERS} ${STORM_LIB add_dependencies(storm copy_storm_headers) add_dependencies(storm copy_resources_headers) +add_dependencies(binaries storm-main) + # installation install(TARGETS storm RUNTIME DESTINATION bin LIBRARY DESTINATION lib) install(TARGETS storm-main RUNTIME DESTINATION bin LIBRARY DESTINATION lib OPTIONAL)