diff options
| author | vagrant <vagrant@localhost.localdomain> | 2019-01-28 11:50:20 +0000 |
|---|---|---|
| committer | vagrant <vagrant@localhost.localdomain> | 2019-01-28 11:50:20 +0000 |
| commit | 0d74c50c48ae518fedb44e5d04a148eaa02b485b (patch) | |
| tree | 9e000d8a05a58d101cd838f9d914bbeb9dcee537 /CMakeLists.txt | |
| parent | a293e77c132f8eaa2b1dd52ae9b926b90f72cfd0 (diff) | |
| parent | 4aa979cd6cd0e437ab5cc02367adf140d63030b6 (diff) | |
| download | regularization-0d74c50c48ae518fedb44e5d04a148eaa02b485b.tar.gz regularization-0d74c50c48ae518fedb44e5d04a148eaa02b485b.tar.bz2 regularization-0d74c50c48ae518fedb44e5d04a148eaa02b485b.tar.xz regularization-0d74c50c48ae518fedb44e5d04a148eaa02b485b.zip | |
Merge branch 'master' of https://github.com/vais-ral/CCPi-Regularisation-Toolkit
Conflicts:
build/jenkins-build.sh
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 550b896..b95107a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,10 @@ set (CIL_VERSION_MAJOR 0) set (CIL_VERSION_MINOR 10) set (CIL_VERSION_PATCH 2) -set (CIL_VERSION '${CIL_VERSION_MAJOR}.${CIL_VERSION_MINOR}.${CIL_VERSION_PATCH}' CACHE INTERNAL "Core Imaging Library version" FORCE) +# set (CIL_VERSION '${CIL_VERSION_MAJOR}.${CIL_VERSION_MINOR}.${CIL_VERSION_PATCH}' CACHE INTERNAL "Core Imaging Library version" FORCE) +# get CIL_VERSION from environment variable and set it in cmake +set (CIL_VERSION $ENV{CIL_VERSION} CACHE INTERNAL "Core Imaging Library version" FORCE) +message(STATUS "CIL_VERSION set to " ${CIL_VERSION}) # set the Python variables for the Conda environment #include(${CMAKE_SOURCE_DIR}/CMake/FindAnacondaEnvironment.cmake) |