Browse Source

Minor improvements for some CMake output

tempestpy_adaptions
Matthias Volk 7 years ago
parent
commit
9e398ffaab
  1. 14
      CMakeLists.txt
  2. 14
      resources/3rdparty/CMakeLists.txt
  3. 4
      resources/3rdparty/carl/CMakeLists.txt

14
CMakeLists.txt

@ -86,7 +86,7 @@ foreach(p LIB BIN INCLUDE CMAKE)
endif() endif()
endforeach() endforeach()
message("CMAKE_INSTALL_DIR: ${CMAKE_INSTALL_DIR}")
message(STATUS "Storm - CMake install dir: ${CMAKE_INSTALL_DIR}")
# If the STORM_DEVELOPER option was turned on, by default we target a debug version, otherwise a release version. # If the STORM_DEVELOPER option was turned on, by default we target a debug version, otherwise a release version.
if (STORM_DEVELOPER) if (STORM_DEVELOPER)
@ -153,15 +153,15 @@ elseif (WIN32)
set(STATIC_EXT ".lib") set(STATIC_EXT ".lib")
set(LIB_PREFIX "") set(LIB_PREFIX "")
endif() endif()
message(STATUS "Assuming extension for shared libraries: ${DYNAMIC_EXT}")
message(STATUS "Assuming extension for static libraries: ${STATIC_EXT}")
message(STATUS "Storm - Assuming extension for shared libraries: ${DYNAMIC_EXT}")
message(STATUS "Storm - Assuming extension for static libraries: ${STATIC_EXT}")
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
set(LIB_EXT ${DYNAMIC_EXT}) set(LIB_EXT ${DYNAMIC_EXT})
message(STATUS "Build dynamic libraries.")
message(STATUS "Storm - Build dynamic libraries.")
else() else()
set(LIB_EXT ${STATIC_EXT}) set(LIB_EXT ${STATIC_EXT})
message(STATUS "Build static libraries.")
message(STATUS "Storm - Build static libraries.")
endif() endif()
############################################################# #############################################################
@ -443,7 +443,7 @@ if (STORM_GIT_VERSION_STRING MATCHES "NOTFOUND")
set(STORM_VERSION_SOURCE "VersionSource::Static") set(STORM_VERSION_SOURCE "VersionSource::Static")
set(STORM_VERSION_COMMITS_AHEAD "boost::none") set(STORM_VERSION_COMMITS_AHEAD "boost::none")
include(version.cmake) include(version.cmake)
message(WARNING "Storm - git version information not available, statically assuming version ${STORM_VERSION_MAJOR}.${STORM_VERSION_MINOR}.${STORM_VERSION_PATCH}.")
message(WARNING "Storm - Git version information not available, statically assuming version ${STORM_VERSION_MAJOR}.${STORM_VERSION_MINOR}.${STORM_VERSION_PATCH}.")
endif() endif()
# check whether there is a label ('alpha', 'pre', etc.) # check whether there is a label ('alpha', 'pre', etc.)
@ -473,7 +473,7 @@ endif()
set(STORM_VERSION "${STORM_VERSION_MAJOR}.${STORM_VERSION_MINOR}.${STORM_VERSION_DEV_PATCH}") set(STORM_VERSION "${STORM_VERSION_MAJOR}.${STORM_VERSION_MINOR}.${STORM_VERSION_DEV_PATCH}")
set(STORM_VERSION_STRING "${STORM_VERSION}${STORM_VERSION_LABEL_STRING}${STORM_VERSION_DEV_STRING}") set(STORM_VERSION_STRING "${STORM_VERSION}${STORM_VERSION_LABEL_STRING}${STORM_VERSION_DEV_STRING}")
message(STATUS "Storm - version is ${STORM_VERSION_STRING} (version ${STORM_VERSION_MAJOR}.${STORM_VERSION_MINOR}.${STORM_VERSION_PATCH}${STORM_VERSION_LABEL_STRING} + ${STORM_VERSION_COMMITS_AHEAD} commits), building from git: ${STORM_VERSION_GIT_HASH} (dirty: ${STORM_VERSION_DIRTY}).")
message(STATUS "Storm - Version is ${STORM_VERSION_STRING} (version ${STORM_VERSION_MAJOR}.${STORM_VERSION_MINOR}.${STORM_VERSION_PATCH}${STORM_VERSION_LABEL_STRING} + ${STORM_VERSION_COMMITS_AHEAD} commits), building from git: ${STORM_VERSION_GIT_HASH} (dirty: ${STORM_VERSION_DIRTY}).")
# Configure a header file to pass some of the CMake settings to the source code # Configure a header file to pass some of the CMake settings to the source code

14
resources/3rdparty/CMakeLists.txt

@ -239,16 +239,16 @@ if(carl_FOUND AND NOT STORM_FORCE_SHIPPED_CARL)
else() else()
set(STORM_SHIPPED_CARL ON) set(STORM_SHIPPED_CARL ON)
# The first external project will be built at *configure stage* # The first external project will be built at *configure stage*
message("START CARL CONFIG PROCESS")
file(MAKE_DIRECTORY ${STORM_3RDPARTY_BINARY_DIR}/carl_download)
message(STATUS "Carl - Start of config process")
file(MAKE_DIRECTORY ${STORM_3RDPARTY_BINARY_DIR}/carl_download)
execute_process( execute_process(
COMMAND ${CMAKE_COMMAND} ${STORM_3RDPARTY_SOURCE_DIR}/carl "-DSTORM_3RDPARTY_BINARY_DIR=${STORM_3RDPARTY_BINARY_DIR}" "-DBoost_LIBRARY_DIRS=${Boost_LIBRARY_DIRS}" "-DBoost_INCLUDE_DIRS=${Boost_INCLUDE_DIRS}" COMMAND ${CMAKE_COMMAND} ${STORM_3RDPARTY_SOURCE_DIR}/carl "-DSTORM_3RDPARTY_BINARY_DIR=${STORM_3RDPARTY_BINARY_DIR}" "-DBoost_LIBRARY_DIRS=${Boost_LIBRARY_DIRS}" "-DBoost_INCLUDE_DIRS=${Boost_INCLUDE_DIRS}"
WORKING_DIRECTORY ${STORM_3RDPARTY_BINARY_DIR}/carl_download WORKING_DIRECTORY ${STORM_3RDPARTY_BINARY_DIR}/carl_download
OUTPUT_VARIABLE carlconfig_out OUTPUT_VARIABLE carlconfig_out
RESULT_VARIABLE carlconfig_result) RESULT_VARIABLE carlconfig_result)
if(NOT carlconfig_result) if(NOT carlconfig_result)
message("${carlconfig_out}")
message(STATUS "${carlconfig_out}")
endif() endif()
execute_process( execute_process(
COMMAND ${CMAKE_COMMAND} --build . --target carl-config COMMAND ${CMAKE_COMMAND} --build . --target carl-config
@ -257,10 +257,10 @@ else()
RESULT_VARIABLE carlconfig_result RESULT_VARIABLE carlconfig_result
) )
if(NOT carlconfig_result) if(NOT carlconfig_result)
message("${carlconfig_out}")
message(STATUS "${carlconfig_out}")
endif() endif()
message("END CARL CONFIG PROCESS")
message(STATUS "Carl - End of config process")
message(STATUS "Storm - Using shipped version of carl.") message(STATUS "Storm - Using shipped version of carl.")
ExternalProject_Add( ExternalProject_Add(
carl carl

4
resources/3rdparty/carl/CMakeLists.txt

@ -4,7 +4,7 @@ include(ExternalProject)
option(STORM_3RDPARTY_BINARY_DIR "3rd party bin dir") option(STORM_3RDPARTY_BINARY_DIR "3rd party bin dir")
message(STORM_3RDPARTY_BINARY_DIR: ${STORM_3RDPARTY_BINARY_DIR})
message(STATUS "Carl - Storm 3rdparty binary dir: ${STORM_3RDPARTY_BINARY_DIR}")
ExternalProject_Add(carl-config ExternalProject_Add(carl-config
GIT_REPOSITORY https://github.com/smtrat/carl GIT_REPOSITORY https://github.com/smtrat/carl
@ -22,4 +22,4 @@ ExternalProject_Add(carl-config
add_custom_target(build-carl) add_custom_target(build-carl)
add_dependencies(build-carl carl-config) add_dependencies(build-carl carl-config)
message("done")
message(STATUS "Carl - Finished configuration.")
Loading…
Cancel
Save