Dev tp

CMake/CMakeLists_root.txt

@@ -13,58 +13,24 @@ if (NOT UNIX)
     message(FATAL_ERROR "Unavailable if not Unix")
 endif ()
-#################
-# ALIB Versioning
-set(ALIB_VERSION_MAJOR {alib_versioning_major})
-set(ALIB_VERSION_MINOR {alib_versioning_minor})
-set(ALIB_VERSION_PATCH {alib_versioning_patch})
-set(ALIB_VERSION ${{ALIB_VERSION_MAJOR}}.${{ALIB_VERSION_MINOR}}.${{ALIB_VERSION_PATCH}})
-mark_as_advanced(ALIB_VERSION)
-
-add_definitions ( -DALIB_VERSION_MAJOR=${{ALIB_VERSION_MAJOR}} -DALIB_VERSION_MINOR=${{ALIB_VERSION_MINOR}} -DALIB_VERSION_PATCH=${{ALIB_VERSION_PATCH}} -DALIB_VERSION=${{ALIB_VERSION}} )
-
-# Get the current working commit hash
-execute_process (
-  COMMAND git rev-parse HEAD
-  WORKING_DIRECTORY ${{CMAKE_SOURCE_DIR}}
-  OUTPUT_VARIABLE ALIB_GIT_COMMIT_HASH
-  RESULT_VARIABLE RET_CODE
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-if("${{RET_CODE}}" STREQUAL "0")
-  add_definitions ( -DALIB_GIT_COMMIT_HASH=${{ALIB_GIT_COMMIT_HASH}} )
-  message ( Git commit hash ${{ALIB_GIT_COMMIT_HASH}} )
-else()
-  message ( Git commit hash not found )
-endif()
-# Get the current working branch
-execute_process (
-  COMMAND git rev-parse --abbrev-ref HEAD
-  WORKING_DIRECTORY ${{CMAKE_SOURCE_DIR}}
-  OUTPUT_VARIABLE ALIB_GIT_BRANCH
-  RESULT_VARIABLE RET_CODE
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-if("${{RET_CODE}}" STREQUAL "0")
-  add_definitions ( -DALIB_GIT_BRANCH=${{ALIB_GIT_BRANCH}} )
-  message ( Git branch ${{ALIB_GIT_BRANCH}} )
-else()
-  message ( Git branch not found )
-endif()
+####################
+# CMake include path
+set(CMAKE_MODULE_PATH ${{CMAKE_SOURCE_DIR}}/CMake)
+# set(CMAKE_TEMPLATE_PATH ${{CMAKE_SOURCE_DIR}}/CMakeTemplates)
+
+#################
+# versioning
+include(git)
+include(versioning)
+set_git_version()
+set_version({alib_versioning_major} {alib_versioning_minor} {alib_versioning_patch})
 ######################
 # Some Makefile tuning
 set(CMAKE_COLOR_MAKEFILE ON)
 # set(CMAKE_VERBOSE_MAKEFILE ON)
-####################
-# CMake include path
-set(CMAKE_MODULE_PATH ${{CMAKE_SOURCE_DIR}}/CMake)
-# set(CMAKE_TEMPLATE_PATH ${{CMAKE_SOURCE_DIR}}/CMakeTemplates)
-
 #########################################################
 # If not specified whether Debug or Release, select debug
 # cmake -DCMAKE_BUILD_TYPE=Release