diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-12-20 07:59:50 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-12-20 07:59:50 -0800 |
| commit | 2882a1ef412643ae29bf4dca12195063764393ff (patch) | |
| tree | 3be133bc03d231755e22923fe611ca42e2ddabc9 /cmake | |
| parent | c819d40c19e4983f0deac4dff671bb25aabfc116 (diff) | |
| download | subsurface-2882a1ef412643ae29bf4dca12195063764393ff.tar.gz | |
Remove the non-canonical Subusrface version
It no longer makes sense to lie about the version. If you are running a product
build, then the canonical version is the same version as the plain version used
to be. And in either case it makes much more sense to simply log the full
version information.
We used to have the differently styled versions for different OSs, but I don't
think this is needed anymore. Let's hope this doesn't go down as one of these
"famous last words" moments...
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/HandleVersionGeneration.cmake | 3 | ||||
| -rw-r--r-- | cmake/Modules/version.cmake | 11 |
2 files changed, 1 insertions, 13 deletions
diff --git a/cmake/Modules/HandleVersionGeneration.cmake b/cmake/Modules/HandleVersionGeneration.cmake index beb4e49a2..4ef42e71f 100644 --- a/cmake/Modules/HandleVersionGeneration.cmake +++ b/cmake/Modules/HandleVersionGeneration.cmake @@ -1,7 +1,6 @@ # Generate the ssrf-config.h every 'make' file(WRITE ${CMAKE_BINARY_DIR}/version.h.in -"#define VERSION_STRING \"@VERSION_STRING@\" -#define GIT_VERSION_STRING \"@GIT_VERSION_STRING@\" +"#define GIT_VERSION_STRING \"@GIT_VERSION_STRING@\" #define CANONICAL_VERSION_STRING \"@CANONICAL_VERSION_STRING@\" ") diff --git a/cmake/Modules/version.cmake b/cmake/Modules/version.cmake index decb7c568..2fc011ffd 100644 --- a/cmake/Modules/version.cmake +++ b/cmake/Modules/version.cmake @@ -1,14 +1,3 @@ -if(${APPLE}) - set(VER_OS darwin) -elseif(${WIN32}) - set(VER_OS win) -else() - set(VER_OS linux) -endif() - -if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - set(VER_OS win) -endif() execute_process( COMMAND sh ${CMAKE_TOP_SRC_DIR}/scripts/get-version linux WORKING_DIRECTORY ${CMAKE_TOP_SRC_DIR} |