Moved Storm main binary to storm-cli folder (#581)

src/CMakeLists.txt

@@ -11,18 +11,19 @@ add_subdirectory(storm-gamebased-ar)
 add_subdirectory(storm-parsers)
 add_subdirectory(storm-version-info)
 add_subdirectory(storm-cli-utilities)
-add_subdirectory(storm-gspn)
-add_subdirectory(storm-gspn-cli)
+add_subdirectory(storm-cli)
+# Additional libraries
+add_subdirectory(storm-conv)
+add_subdirectory(storm-conv-cli)
 add_subdirectory(storm-dft)
 add_subdirectory(storm-dft-cli)
+add_subdirectory(storm-gspn)
+add_subdirectory(storm-gspn-cli)
 add_subdirectory(storm-pars)
 add_subdirectory(storm-pars-cli)
 add_subdirectory(storm-pomdp)
 add_subdirectory(storm-pomdp-cli)
 
-add_subdirectory(storm-conv)
-add_subdirectory(storm-conv-cli)
-
 if (STORM_EXCLUDE_TESTS_FROM_ALL)
     add_subdirectory(test EXCLUDE_FROM_ALL)
 else()

src/storm-cli-utilities/CMakeLists.txt

@@ -2,8 +2,6 @@ file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/storm-cli-utilities/*.h ${
 
 register_source_groups_from_filestructure("${ALL_FILES}" storm-cli-utilities)
 
-
-
 file(GLOB_RECURSE STORM_CLI_UTIL_SOURCES ${PROJECT_SOURCE_DIR}/src/storm-cli-utilities/*.cpp)
 file(GLOB_RECURSE STORM_CLI_UTIL_HEADERS ${PROJECT_SOURCE_DIR}/src/storm-cli-utilities/*.h)
 
@@ -12,27 +10,25 @@ file(GLOB_RECURSE STORM_CLI_UTIL_HEADERS ${PROJECT_SOURCE_DIR}/src/storm-cli-uti
 add_library(storm-cli-utilities SHARED ${STORM_CLI_UTIL_SOURCES} ${STORM_CLI_UTIL_HEADERS})
 target_precompile_headers(storm-cli-utilities REUSE_FROM storm)
 
-
 # Remove define symbol for shared libstorm.
 set_target_properties(storm-cli-utilities PROPERTIES DEFINE_SYMBOL "")
-#add_dependencies(storm resources)
 list(APPEND STORM_TARGETS storm-cli-utilities)
 set(STORM_TARGETS ${STORM_TARGETS} PARENT_SCOPE)
 
 target_link_libraries(storm-cli-utilities PUBLIC storm storm-counterexamples storm-gamebased-ar storm-parsers storm-version-info)
 
 # Install storm headers to include directory.
 foreach(HEADER ${STORM_CLI_UTIL_HEADERS})
-    string(REGEX REPLACE "${PROJECT_SOURCE_DIR}/src/?" "" RELATIVE_HEADER_PATH ${HEADER})
-    string(REGEX MATCH "(.*)[/\\]" RELATIVE_DIRECTORY ${RELATIVE_HEADER_PATH})
-    string(REGEX REPLACE "${RELATIVE_DIRECTORY}/?" "" HEADER_FILENAME ${RELATIVE_HEADER_PATH})
-    add_custom_command(
-            OUTPUT ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}
-            COMMAND ${CMAKE_COMMAND} -E copy ${HEADER} ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
-            DEPENDS ${HEADER}
-    )
-    list(APPEND STORM_CLI_UTIL_OUTPUT_HEADERS "${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}")
+	string(REGEX REPLACE "${PROJECT_SOURCE_DIR}/src/?" "" RELATIVE_HEADER_PATH ${HEADER})
+	string(REGEX MATCH "(.*)[/\\]" RELATIVE_DIRECTORY ${RELATIVE_HEADER_PATH})
+	string(REGEX REPLACE "${RELATIVE_DIRECTORY}/?" "" HEADER_FILENAME ${RELATIVE_HEADER_PATH})
+	add_custom_command(
+		OUTPUT ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}
+		COMMAND ${CMAKE_COMMAND} -E copy ${HEADER} ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
+		DEPENDS ${HEADER}
+	)
+	list(APPEND STORM_CLI_UTIL_OUTPUT_HEADERS "${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}")
 endforeach()
 add_custom_target(copy_storm_cli_util_headers DEPENDS ${STORM_CLI_UTIL_OUTPUT_HEADERS} ${STORM_CLI_UTIL_HEADERS})
 add_dependencies(storm-cli-utilities copy_storm_cli_util_headers)

src/storm-cli/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Create main binary storm.
+add_executable(storm-cli ${PROJECT_SOURCE_DIR}/src/storm-cli/storm-cli.cpp)
+target_link_libraries(storm-cli storm storm-cli-utilities)
+set_target_properties(storm-cli PROPERTIES OUTPUT_NAME "storm")
+target_precompile_headers(storm-cli PRIVATE ${STORM_PRECOMPILED_HEADERS})
+
+add_dependencies(binaries storm-cli)
+
+# installation
+install(TARGETS storm-cli EXPORT storm_Targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib OPTIONAL)

src/storm-conv-cli/CMakeLists.txt

@@ -1,8 +1,8 @@
 # Create storm-conv.
 add_executable(storm-conv-cli ${PROJECT_SOURCE_DIR}/src/storm-conv-cli/storm-conv.cpp)
-target_link_libraries(storm-conv-cli storm-conv storm-cli-utilities) # Adding headers for xcode
+target_link_libraries(storm-conv-cli storm-conv storm-cli-utilities)
 set_target_properties(storm-conv-cli PROPERTIES OUTPUT_NAME "storm-conv")
-target_precompile_headers(storm-conv-cli REUSE_FROM storm-main)
+target_precompile_headers(storm-conv-cli REUSE_FROM storm-cli)
 
 add_dependencies(binaries storm-conv-cli)
 

src/storm-conv/CMakeLists.txt

@@ -2,20 +2,16 @@ file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/storm-conv/*.h ${PROJECT_S
 
 register_source_groups_from_filestructure("${ALL_FILES}" storm-conv)
 
-
-
 file(GLOB_RECURSE STORM_CONV_SOURCES ${PROJECT_SOURCE_DIR}/src/storm-conv/*/*.cpp)
 file(GLOB_RECURSE STORM_CONV_HEADERS ${PROJECT_SOURCE_DIR}/src/storm-conv/*/*.h)
 
 
 # Create storm-conv.
 add_library(storm-conv SHARED ${STORM_CONV_SOURCES} ${STORM_CONV_HEADERS})
-
 target_precompile_headers(storm-conv REUSE_FROM storm)
 
 # Remove define symbol for shared libstorm.
 set_target_properties(storm-conv PROPERTIES DEFINE_SYMBOL "")
-#add_dependencies(storm resources)
 list(APPEND STORM_TARGETS storm-conv)
 set(STORM_TARGETS ${STORM_TARGETS} PARENT_SCOPE)
 

src/storm-counterexamples/CMakeLists.txt

@@ -2,20 +2,16 @@ file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/storm-counterexamples/*.h
 
 register_source_groups_from_filestructure("${ALL_FILES}" storm-counterexamples)
 
-
-
 file(GLOB_RECURSE STORM_CEX_SOURCES ${PROJECT_SOURCE_DIR}/src/storm-counterexamples/*/*.cpp)
 file(GLOB_RECURSE STORM_CEX_HEADERS ${PROJECT_SOURCE_DIR}/src/storm-counterexamples/*/*.h)
 
 
 # Create storm-counterexamples.
 add_library(storm-counterexamples SHARED ${STORM_CEX_SOURCES} ${STORM_CEX_HEADERS})
-
 target_precompile_headers(storm-counterexamples REUSE_FROM storm)
 
 # Remove define symbol for shared libstorm.
 set_target_properties(storm-counterexamples PROPERTIES DEFINE_SYMBOL "")
-#add_dependencies(storm resources)
 list(APPEND STORM_TARGETS storm-counterexamples)
 set(STORM_TARGETS ${STORM_TARGETS} PARENT_SCOPE)
 

src/storm-dft-cli/CMakeLists.txt

@@ -1,8 +1,8 @@
 # Create storm-dft.
 add_executable(storm-dft-cli ${PROJECT_SOURCE_DIR}/src/storm-dft-cli/storm-dft.cpp)
-target_link_libraries(storm-dft-cli storm-dft storm-cli-utilities) # Adding headers for xcode
+target_link_libraries(storm-dft-cli storm-dft storm-cli-utilities)
 set_target_properties(storm-dft-cli PROPERTIES OUTPUT_NAME "storm-dft")
-target_precompile_headers(storm-dft-cli REUSE_FROM storm-main)
+target_precompile_headers(storm-dft-cli REUSE_FROM storm-cli)
 
 add_dependencies(binaries storm-dft-cli)
 

src/storm-dft/CMakeLists.txt

@@ -2,8 +2,6 @@ file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/storm-dft/*.h ${PROJECT_SO
 
 register_source_groups_from_filestructure("${ALL_FILES}" storm-dft)
 
-
-
 file(GLOB_RECURSE STORM_DFT_SOURCES ${PROJECT_SOURCE_DIR}/src/storm-dft/*/*.cpp)
 file(GLOB_RECURSE STORM_DFT_HEADERS ${PROJECT_SOURCE_DIR}/src/storm-dft/*/*.h)
 
@@ -14,7 +12,6 @@ target_precompile_headers(storm-dft REUSE_FROM storm)
 
 # Remove define symbol for shared libstorm.
 set_target_properties(storm-dft PROPERTIES DEFINE_SYMBOL "")
-#add_dependencies(storm resources)
 list(APPEND STORM_TARGETS storm-dft)
 set(STORM_TARGETS ${STORM_TARGETS} PARENT_SCOPE)
 

src/storm-gamebased-ar/CMakeLists.txt

@@ -5,30 +5,31 @@ register_source_groups_from_filestructure("${ALL_FILES}" storm-gamebased-ar)
 file(GLOB_RECURSE STORM_GBAR_SOURCES ${PROJECT_SOURCE_DIR}/src/storm-gamebased-ar/*/*.cpp)
 file(GLOB_RECURSE STORM_GBAR_HEADERS ${PROJECT_SOURCE_DIR}/src/storm-gamebased-ar/*/*.h)
 
+
 # Create storm-gamebased-ar.
 add_library(storm-gamebased-ar SHARED ${STORM_GBAR_SOURCES} ${STORM_GBAR_HEADERS})
+target_precompile_headers(storm-gamebased-ar REUSE_FROM storm)
 
 # Remove define symbol for shared libstorm.
 set_target_properties(storm-gamebased-ar PROPERTIES DEFINE_SYMBOL "")
 list(APPEND STORM_TARGETS storm-gamebased-ar)
 set(STORM_TARGETS ${STORM_TARGETS} PARENT_SCOPE)
 
 target_link_libraries(storm-gamebased-ar PUBLIC storm)
-target_precompile_headers(storm-gamebased-ar REUSE_FROM storm)
 
 # Install storm headers to include directory.
 foreach (HEADER ${STORM_GBAR_HEADERS})
-    string(REGEX REPLACE "${PROJECT_SOURCE_DIR}/src/?" "" RELATIVE_HEADER_PATH ${HEADER})
-    string(REGEX MATCH "(.*)[/\\]" RELATIVE_DIRECTORY ${RELATIVE_HEADER_PATH})
-    string(REGEX REPLACE "${RELATIVE_DIRECTORY}/?" "" HEADER_FILENAME ${RELATIVE_HEADER_PATH})
-    add_custom_command(
-            OUTPUT ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}
-            COMMAND ${CMAKE_COMMAND} -E copy ${HEADER} ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
-            DEPENDS ${HEADER}
-    )
-    list(APPEND STORM_GBAR_OUTPUT_HEADERS "${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}")
-endforeach ()
+	string(REGEX REPLACE "${PROJECT_SOURCE_DIR}/src/?" "" RELATIVE_HEADER_PATH ${HEADER})
+	string(REGEX MATCH "(.*)[/\\]" RELATIVE_DIRECTORY ${RELATIVE_HEADER_PATH})
+	string(REGEX REPLACE "${RELATIVE_DIRECTORY}/?" "" HEADER_FILENAME ${RELATIVE_HEADER_PATH})
+	add_custom_command(
+		OUTPUT ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}
+		COMMAND ${CMAKE_COMMAND} -E copy ${HEADER} ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
+		DEPENDS ${HEADER}
+	)
+	list(APPEND STORM_GBAR_OUTPUT_HEADERS "${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}")
+endforeach()
 add_custom_target(copy_storm_gbar_headers DEPENDS ${STORM_GBAR_OUTPUT_HEADERS} ${STORM_GBAR_HEADERS})
 add_dependencies(storm-gamebased-ar copy_storm_gbar_headers)
 

src/storm-gspn-cli/CMakeLists.txt

@@ -1,8 +1,8 @@
 # Create storm-gspn.
 add_executable(storm-gspn-cli ${PROJECT_SOURCE_DIR}/src/storm-gspn-cli/storm-gspn.cpp)
-target_link_libraries(storm-gspn-cli storm-gspn storm-cli-utilities) # Adding headers for xcode
+target_link_libraries(storm-gspn-cli storm-gspn storm-cli-utilities)
 set_target_properties(storm-gspn-cli PROPERTIES OUTPUT_NAME "storm-gspn")
-target_precompile_headers(storm-gspn-cli REUSE_FROM storm-main)
+target_precompile_headers(storm-gspn-cli REUSE_FROM storm-cli)
 
 add_dependencies(binaries storm-gspn-cli)
 

src/storm-gspn/CMakeLists.txt

@@ -2,8 +2,6 @@ file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/storm-gspn/*.h ${PROJECT_S
 
 register_source_groups_from_filestructure("${ALL_FILES}" storm-gspn)
 
-
-
 file(GLOB_RECURSE STORM_GSPN_SOURCES ${PROJECT_SOURCE_DIR}/src/storm-gspn/*/*.cpp)
 file(GLOB_RECURSE STORM_GSPN_HEADERS ${PROJECT_SOURCE_DIR}/src/storm-gspn/*/*.h)
 
@@ -14,9 +12,9 @@ target_precompile_headers(storm-gspn REUSE_FROM storm)
 
 # Remove define symbol for shared libstorm.
 set_target_properties(storm-gspn PROPERTIES DEFINE_SYMBOL "")
-#add_dependencies(storm resources)
 list(APPEND STORM_TARGETS storm-gspn)
 set(STORM_TARGETS ${STORM_TARGETS} PARENT_SCOPE)
+
 target_link_libraries(storm-gspn PUBLIC storm storm-conv storm-parsers ${STORM_GSPN_LINK_LIBRARIES})
 
 # Install storm headers to include directory.
@@ -37,3 +35,4 @@ add_dependencies(storm-gspn copy_storm_gspn_headers)
 
 # installation
 install(TARGETS storm-gspn EXPORT storm_Targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib OPTIONAL)
+

src/storm-pars-cli/CMakeLists.txt

@@ -3,11 +3,10 @@ add_executable(storm-pars-cli ${PROJECT_SOURCE_DIR}/src/storm-pars-cli/storm-par
                               ${PROJECT_SOURCE_DIR}/src/storm-pars-cli/print.cpp
                               ${PROJECT_SOURCE_DIR}/src/storm-pars-cli/monotonicity.cpp
                               ${PROJECT_SOURCE_DIR}/src/storm-pars-cli/feasibility.cpp
-        )
-target_link_libraries(storm-pars-cli storm-pars storm-cli-utilities) # Adding headers for xcode
+)
+target_link_libraries(storm-pars-cli storm-pars storm-cli-utilities)
 set_target_properties(storm-pars-cli PROPERTIES OUTPUT_NAME "storm-pars")
-target_precompile_headers(storm-pars-cli REUSE_FROM storm-main)
-
+target_precompile_headers(storm-pars-cli REUSE_FROM storm-cli)
 
 add_dependencies(binaries storm-pars-cli)
 

src/storm-pars/CMakeLists.txt

@@ -2,24 +2,20 @@ file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/storm-pars/*.h ${PROJECT_S
 
 register_source_groups_from_filestructure("${ALL_FILES}" storm-pars)
 
-
-
 file(GLOB_RECURSE STORM_PARS_SOURCES ${PROJECT_SOURCE_DIR}/src/storm-pars/*/*.cpp)
 file(GLOB_RECURSE STORM_PARS_HEADERS ${PROJECT_SOURCE_DIR}/src/storm-pars/*/*.h)
 
 
 # Create storm-pars.
 add_library(storm-pars SHARED ${STORM_PARS_SOURCES} ${STORM_PARS_HEADERS})
+target_precompile_headers(storm-pars REUSE_FROM storm)
 
 # Remove define symbol for shared libstorm.
 set_target_properties(storm-pars PROPERTIES DEFINE_SYMBOL "")
-#add_dependencies(storm resources)
 list(APPEND STORM_TARGETS storm-pars)
 set(STORM_TARGETS ${STORM_TARGETS} PARENT_SCOPE)
 
 target_link_libraries(storm-pars PUBLIC storm ${STORM_PARS_LINK_LIBRARIES})
-target_precompile_headers(storm-pars REUSE_FROM storm)
-
 
 # Install storm headers to include directory.
 foreach(HEADER ${STORM_PARS_HEADERS})

src/storm-parsers/CMakeLists.txt

@@ -2,25 +2,23 @@ file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/storm-parsers/*.h ${PROJEC
 
 register_source_groups_from_filestructure("${ALL_FILES}" storm-parsers)
 
-
-
 file(GLOB_RECURSE STORM_PARSER_SOURCES ${PROJECT_SOURCE_DIR}/src/storm-parsers/*/*.cpp)
 file(GLOB_RECURSE STORM_PARSER_HEADERS ${PROJECT_SOURCE_DIR}/src/storm-parsers/*/*.h)
 
 
 # Disable Debug compiler flags for PrismParser to lessen memory consumption during compilation
 SET_SOURCE_FILES_PROPERTIES(${PROJECT_SOURCE_DIR}/src/storm-parsers/parser/PrismParser.cpp PROPERTIES COMPILE_FLAGS -g0)
+
 # Create storm-parsers.
 add_library(storm-parsers SHARED ${STORM_PARSER_SOURCES} ${STORM_PARSER_HEADERS})
+target_precompile_headers(storm-parsers REUSE_FROM storm)
 
 # Remove define symbol for shared libstorm.
 set_target_properties(storm-parsers PROPERTIES DEFINE_SYMBOL "")
-#add_dependencies(storm resources)
 list(APPEND STORM_TARGETS storm-parsers)
 set(STORM_TARGETS ${STORM_TARGETS} PARENT_SCOPE)
 
 target_link_libraries(storm-parsers PUBLIC storm)
-target_precompile_headers(storm-parsers REUSE_FROM storm)
 
 # Install storm headers to include directory.
 foreach(HEADER ${STORM_PARSER_HEADERS})

src/storm-permissive/CMakeLists.txt

@@ -5,30 +5,31 @@ register_source_groups_from_filestructure("${ALL_FILES}" storm-permissive)
 file(GLOB_RECURSE STORM_PERMISSIVE_SOURCES ${PROJECT_SOURCE_DIR}/src/storm-permissive/*/*.cpp)
 file(GLOB_RECURSE STORM_PERMISSIVE_HEADERS ${PROJECT_SOURCE_DIR}/src/storm-permissive/*/*.h)
 
+
 # Create storm-permissive.
 add_library(storm-permissive SHARED ${STORM_PERMISSIVE_SOURCES} ${STORM_PERMISSIVE_HEADERS})
+target_precompile_headers(storm-permissive REUSE_FROM storm)
 
 # Remove define symbol for shared libstorm.
 set_target_properties(storm-permissive PROPERTIES DEFINE_SYMBOL "")
 list(APPEND STORM_TARGETS storm-permissive)
 set(STORM_TARGETS ${STORM_TARGETS} PARENT_SCOPE)
 
 target_link_libraries(storm-permissive PUBLIC storm)
-target_precompile_headers(storm-permissive REUSE_FROM storm)
 
 # Install storm headers to include directory.
 foreach (HEADER ${STORM_PERMISSIVE_HEADERS})
-    string(REGEX REPLACE "${PROJECT_SOURCE_DIR}/src/?" "" RELATIVE_HEADER_PATH ${HEADER})
-    string(REGEX MATCH "(.*)[/\\]" RELATIVE_DIRECTORY ${RELATIVE_HEADER_PATH})
-    string(REGEX REPLACE "${RELATIVE_DIRECTORY}/?" "" HEADER_FILENAME ${RELATIVE_HEADER_PATH})
-    add_custom_command(
-            OUTPUT ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}
-            COMMAND ${CMAKE_COMMAND} -E copy ${HEADER} ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
-            DEPENDS ${HEADER}
-    )
-    list(APPEND STORM_PERMISSIVE_OUTPUT_HEADERS "${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}")
-endforeach ()
+	string(REGEX REPLACE "${PROJECT_SOURCE_DIR}/src/?" "" RELATIVE_HEADER_PATH ${HEADER})
+	string(REGEX MATCH "(.*)[/\\]" RELATIVE_DIRECTORY ${RELATIVE_HEADER_PATH})
+	string(REGEX REPLACE "${RELATIVE_DIRECTORY}/?" "" HEADER_FILENAME ${RELATIVE_HEADER_PATH})
+	add_custom_command(
+		OUTPUT ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}
+		COMMAND ${CMAKE_COMMAND} -E copy ${HEADER} ${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}
+		DEPENDS ${HEADER}
+	)
+	list(APPEND STORM_PERMISSIVE_OUTPUT_HEADERS "${CMAKE_BINARY_DIR}/include/${RELATIVE_DIRECTORY}${HEADER_FILENAME}")
+endforeach()
 add_custom_target(copy_storm_permissive_headers DEPENDS ${STORM_PERMISSIVE_OUTPUT_HEADERS} ${STORM_PERMISSIVE_HEADERS})
 add_dependencies(storm-permissive copy_storm_permissive_headers)
 

src/storm-pomdp-cli/CMakeLists.txt

@@ -1,11 +1,10 @@
 # Create storm-pomdp.
-
 file(GLOB_RECURSE STORM_POMDP_CLI_SOURCES ${PROJECT_SOURCE_DIR}/src/storm-pomdp-cli/*/*.cpp)
+
 add_executable(storm-pomdp-cli ${PROJECT_SOURCE_DIR}/src/storm-pomdp-cli/storm-pomdp.cpp ${STORM_POMDP_CLI_SOURCES})
-target_link_libraries(storm-pomdp-cli storm-pomdp storm-cli-utilities) # Adding headers for xcode
+target_link_libraries(storm-pomdp-cli storm-pomdp storm-cli-utilities)
 set_target_properties(storm-pomdp-cli PROPERTIES OUTPUT_NAME "storm-pomdp")
-target_precompile_headers(storm-pomdp-cli REUSE_FROM storm-main)
-
+target_precompile_headers(storm-pomdp-cli REUSE_FROM storm-cli)
 
 add_dependencies(binaries storm-pomdp-cli)