Browse Source

removed debug output and some deprecated python inclusion

tempestpy_adaptions
Sebastian Junges 8 years ago
parent
commit
3306d2bb1e
  1. 5
      CMakeLists.txt
  2. 1
      resources/cmake/macros/export.cmake
  3. 1
      resources/cmake/macros/imported.cmake

5
CMakeLists.txt

@ -362,14 +362,9 @@ include_directories("${PROJECT_BINARY_DIR}/include")
include(CTest) include(CTest)
# Python bindings for storm # Python bindings for storm
if(STORM_PYTHON)
add_subdirectory(stormpy)
endif()
set(STORM_TARGETS "") set(STORM_TARGETS "")
add_subdirectory(src) add_subdirectory(src)
message("STORM_TARGETS: ${STORM_TARGETS}")
include(export) include(export)
include(StormCPackConfig.cmake) include(StormCPackConfig.cmake)

1
resources/cmake/macros/export.cmake

@ -20,7 +20,6 @@ endforeach()
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
set(CONF_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/include/") set(CONF_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/include/")
message("CMAKE_INSTALL_DIR: ${CMAKE_INSTALL_DIR}")
configure_package_config_file( configure_package_config_file(
resources/cmake/stormConfig.cmake.in resources/cmake/stormConfig.cmake.in
${PROJECT_BINARY_DIR}/stormConfig.cmake ${PROJECT_BINARY_DIR}/stormConfig.cmake

1
resources/cmake/macros/imported.cmake

@ -7,7 +7,6 @@ macro(add_imported_library_interface name include)
endmacro(add_imported_library_interface) endmacro(add_imported_library_interface)
macro(add_imported_library name type lib include) macro(add_imported_library name type lib include)
message("${name} include ${include}")
# Workaround from https://cmake.org/Bug/view.php?id=15052 # Workaround from https://cmake.org/Bug/view.php?id=15052
file(MAKE_DIRECTORY "${include}") file(MAKE_DIRECTORY "${include}")
if("${lib}" STREQUAL "") if("${lib}" STREQUAL "")

Loading…
Cancel
Save