CMake: Make PROJECT_VERSION_EXTENSION code simpler

[metze/wireshark/wip.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12b8f13cdb6f59386508ac12174db43278cfc503..0d1d94836726d75687e078adad03745778d55ce1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,14 +180,10 @@ set(PROJECT_MAJOR_VERSION 2)
 set(PROJECT_MINOR_VERSION 1)
 set(PROJECT_PATCH_VERSION 1)
 set(PROJECT_BUILD_VERSION ${GIT_REVISION})
-# Updated by make-version.pl
-set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
-if(NOT DEFINED PROJECT_VERSION_EXTENSION)
-       if (DEFINED ENV{WIRESHARK_VERSION_EXTRA})
-               set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
-       else()
-               set(PROJECT_VERSION_EXTENSION "-git")
-       endif()
+set(PROJECT_VERSION_EXTENSION "-git")
+
+if(ENV{WIRESHARK_VERSION_EXTRA})
+       set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
 endif()
 
 set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}")