diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 69b0ef31..874163f8 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -3,33 +3,6 @@ cmake_minimum_required(VERSION 2.8) project (hackrf_all) -#set(RELEASE "") - -if(NOT DEFINED RELEASE) - execute_process( - COMMAND git log -n 1 --format=%h - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - RESULT_VARIABLE GIT_EXIT_VALUE - ERROR_QUIET - OUTPUT_VARIABLE GIT_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - if (GIT_EXIT_VALUE) - set(RELEASE "unknown") - else (GIT_EXIT_VALUE) - execute_process( - COMMAND git status -s --untracked-files=no - OUTPUT_VARIABLE DIRTY - ) - if ( NOT "${DIRTY}" STREQUAL "" ) - set(DIRTY_FLAG "*") - else() - set(DIRTY_FLAG "") - endif() - set(RELEASE "git-${GIT_VERSION}${DIRTY_FLAG}") - endif (GIT_EXIT_VALUE) -endif() - add_subdirectory(libhackrf) add_subdirectory(hackrf-tools) diff --git a/host/cmake/set_release.cmake b/host/cmake/set_release.cmake new file mode 100644 index 00000000..875808f9 --- /dev/null +++ b/host/cmake/set_release.cmake @@ -0,0 +1,26 @@ +#set(RELEASE "") + +if(NOT DEFINED RELEASE) + execute_process( + COMMAND git log -n 1 --format=%h + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + RESULT_VARIABLE GIT_EXIT_VALUE + ERROR_QUIET + OUTPUT_VARIABLE GIT_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if (GIT_EXIT_VALUE) + set(RELEASE "unknown") + else (GIT_EXIT_VALUE) + execute_process( + COMMAND git status -s --untracked-files=no + OUTPUT_VARIABLE DIRTY + ) + if ( NOT "${DIRTY}" STREQUAL "" ) + set(DIRTY_FLAG "*") + else() + set(DIRTY_FLAG "") + endif() + set(RELEASE "git-${GIT_VERSION}${DIRTY_FLAG}") + endif (GIT_EXIT_VALUE) +endif() diff --git a/host/hackrf-tools/CMakeLists.txt b/host/hackrf-tools/CMakeLists.txt index 18dbf007..fd9f83be 100644 --- a/host/hackrf-tools/CMakeLists.txt +++ b/host/hackrf-tools/CMakeLists.txt @@ -24,6 +24,7 @@ cmake_minimum_required(VERSION 2.8) project(hackrf-tools C) set(PACKAGE hackrf-tools) +include(${PROJECT_SOURCE_DIR}/../cmake/set_release.cmake) add_definitions(-DTOOL_RELEASE="${RELEASE}") set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../cmake/modules) diff --git a/host/libhackrf/CMakeLists.txt b/host/libhackrf/CMakeLists.txt index c3cd4946..08168941 100644 --- a/host/libhackrf/CMakeLists.txt +++ b/host/libhackrf/CMakeLists.txt @@ -29,6 +29,7 @@ set(PACKAGE libhackrf) set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}) set(VERSION ${VERSION_STRING}) add_definitions(-DLIBRARY_VERSION="${VERSION_STRING}") +include(${PROJECT_SOURCE_DIR}/../cmake/set_release.cmake) add_definitions(-DLIBRARY_RELEASE="${RELEASE}") set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../cmake/modules)