From 85a94d67d3e248a34db67ed54cdad1040d88cdea Mon Sep 17 00:00:00 2001 From: Leonardo Di Donato Date: Tue, 16 Jul 2019 16:12:58 +0200 Subject: [PATCH] build: falco version from git index when not defined Signed-off-by: Leonardo Di Donato --- CMakeLists.txt | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d790f911..ee9cdfb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,10 +21,6 @@ project(falco) option(BUILD_WARNINGS_AS_ERRORS "Enable building with -Wextra -Werror flags") -if(NOT DEFINED FALCO_VERSION) - set(FALCO_VERSION "0.1.1dev") -endif() - if(NOT DEFINED FALCO_ETC_DIR) set(FALCO_ETC_DIR "/etc/falco") endif() @@ -79,6 +75,30 @@ if(NOT SYSDIG_DIR) set(SYSDIG_DIR "${PROJECT_SOURCE_DIR}/../sysdig") endif() +# Add path for custom CMake modules +list(APPEND CMAKE_MODULE_PATH + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") + +# Add path for custom CMake modules used to build dependencies from Sysdig (libscap, libsinsp) +list(APPEND CMAKE_MODULE_PATH + "${SYSDIG_DIR}/cmake/modules") + +# Create the falco version variable according to git index +if(NOT DEFINED FALCO_VERSION) + include(GetGitRevisionDescription) + git_get_exact_tag(FALCO_TAG) + if(NOT FALCO_TAG) + git_describe(FALCO_VERSION "--always") + git_local_changes(FALCO_CHANGES) + if(FALCO_CHANGES STREQUAL "DIRTY") + string(TOLOWER "${FALCO_CHANGES}" FALCO_CHANGES) + set(FALCO_VERSION "${FALCO_VERSION}-${FALCO_CHANGES}") + endif() + else() + set(FALCO_VERSION "${FALCO_TAG}") + endif() +endif() + # make luaJIT work on OS X if(APPLE) set(CMAKE_EXE_LINKER_FLAGS "-pagezero_size 10000 -image_base 100000000") @@ -606,14 +626,6 @@ add_subdirectory(test) add_subdirectory(rules) add_subdirectory(docker) -# Add path for custom CMake modules used to build dependencies from Sysdig (libscap, libsinsp) -list(APPEND CMAKE_MODULE_PATH - "${SYSDIG_DIR}/cmake/modules") - -# Add path for custom CMake modules -list(APPEND CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") - if(CMAKE_SYSTEM_NAME MATCHES "Linux") add_subdirectory("${SYSDIG_DIR}/driver" "${PROJECT_BINARY_DIR}/driver") include(FindMakedev)