From 0542d66620146fc1a8b5de94cfebcf9fd964661b Mon Sep 17 00:00:00 2001 From: dehnert Date: Mon, 26 Jun 2017 18:22:24 +0200 Subject: [PATCH 1/3] improved checking for git revision information --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 024fc9689..9d8394166 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -383,7 +383,7 @@ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+\\-([a-z0-9]+).*" "\\1" string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+\\-[a-z0-9]+\\-(.*)" "\\1" STORM_VERSION_APPENDIX "${STORM_GIT_VERSION_STRING}") # now check whether the git version lookup failed -if (STORM_VERSION_MAJOR STREQUAL "HEAD-HASH-NOTFOUND") +if (STORM_VERSION_MAJOR MATCHES "NOTFOUND") set(STORM_VERSION_MAJOR 1) set(STORM_VERSION_MINOR 0) set(STORM_VERSION_PATCH 0) From 3e7dd56defdee8d8c0a1945e16d92796b66659b7 Mon Sep 17 00:00:00 2001 From: dehnert Date: Mon, 26 Jun 2017 18:24:20 +0200 Subject: [PATCH 2/3] fixed static version information (used in the absence of git version information) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d8394166..d5b905eb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -386,7 +386,7 @@ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+\\-[a-z0-9]+\\-(.*)" "\\ if (STORM_VERSION_MAJOR MATCHES "NOTFOUND") set(STORM_VERSION_MAJOR 1) set(STORM_VERSION_MINOR 0) - set(STORM_VERSION_PATCH 0) + set(STORM_VERSION_PATCH 2) set(STORM_VERSION_GIT_HASH "") set(STORM_VERSION_COMMITS_AHEAD 0) set(STORM_VERSION_DIRTY boost::none) From e5cbc25f00535dfc0c3de4a6bcd94cbad509be84 Mon Sep 17 00:00:00 2001 From: dehnert Date: Mon, 26 Jun 2017 18:46:07 +0200 Subject: [PATCH 3/3] properly installing dylib resulting from shipped carl build (now considers carl version) --- resources/3rdparty/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/3rdparty/CMakeLists.txt b/resources/3rdparty/CMakeLists.txt index 75d8ec4d1..4148df10a 100644 --- a/resources/3rdparty/CMakeLists.txt +++ b/resources/3rdparty/CMakeLists.txt @@ -215,7 +215,7 @@ if(USE_CARL) set(STORM_SHIPPED_CARL OFF) set(STORM_HAVE_CARL ON) message(STATUS "Storm - Use system version of carl.") - message(STATUS "Storm - Linking with carl ${carl_VERSION} (include: ${carl_INCLUDE_DIR}, library ${carl_LIBRARIES}, CARL_USE_CLN_NUMBERS: ${CARL_USE_CLN_NUMBERS}, CARL_USE_GINAC: ${CARL_USE_GINAC}).") + message(STATUS "Storm - Linking with preinstalled carl ${carl_VERSION} (include: ${carl_INCLUDE_DIR}, library ${carl_LIBRARIES}, CARL_USE_CLN_NUMBERS: ${CARL_USE_CLN_NUMBERS}, CARL_USE_GINAC: ${CARL_USE_GINAC}).") set(STORM_HAVE_CLN ${CARL_USE_CLN_NUMBERS}) set(STORM_HAVE_GINAC ${CARL_USE_GINAC}) @@ -257,8 +257,6 @@ if(USE_CARL) BUILD_BYPRODUCTS ${STORM_3RDPARTY_BINARY_DIR}/carl/lib/libcarl${DYNAMIC_EXT} ) include(${STORM_3RDPARTY_BINARY_DIR}/carl/carlExport/carlConfig.cmake) - message("CARL_USE_CLN_NUMBERS: ${CARL_USE_CLN_NUMBERS}, CARL_USE_GINAC: ${CARL_USE_GINAC}") - set(STORM_HAVE_CLN ${CARL_USE_CLN_NUMBERS}) set(STORM_HAVE_GINAC ${CARL_USE_GINAC}) @@ -267,9 +265,12 @@ if(USE_CARL) set(carl_INCLUDE_DIR "${STORM_3RDPARTY_BINARY_DIR}/carl/include/") set(carl_LIBRARIES ${STORM_3RDPARTY_BINARY_DIR}/carl/lib/libcarl${DYNAMIC_EXT}) set(STORM_HAVE_CARL ON) + + message(STATUS "Storm - Linking with shipped carl ${carl_VERSION} (include: ${carl_INCLUDE_DIR}, library ${carl_LIBRARIES}, CARL_USE_CLN_NUMBERS: ${CARL_USE_CLN_NUMBERS}, CARL_USE_GINAC: ${CARL_USE_GINAC}).") + # install the carl dynamic library if we build it - install(FILES ${STORM_3RDPARTY_BINARY_DIR}/carl/lib/libcarl.1.0.0${DYNAMIC_EXT} DESTINATION lib) + install(FILES ${STORM_3RDPARTY_BINARY_DIR}/carl/lib/libcarl.${carl_VERSION}${DYNAMIC_EXT} DESTINATION lib) endif() if(STORM_USE_CLN_RF AND NOT STORM_HAVE_CLN)