Skip to content
Snippets Groups Projects
Commit 039e9f07 authored by calrama's avatar calrama
Browse files

Update use of (git) source version

parent 81b6dbff
No related branches found
No related tags found
No related merge requests found
Pipeline #26652 passed
Pipeline: biotracker

#26660

    cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
    file(READ VERSION PROJECT_VERSION) exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "describe --dirty --always --exclude '*'" OUTPUT_VARIABLE SOURCE_VERSION)
    project(biotracker-utility project(biotracker-utility
    VERSION ${PROJECT_VERSION} LANGUAGES CXX
    LANGUAGES CXX) )
    include(GNUInstallDirs) include(GNUInstallDirs)
    ...@@ -33,8 +33,8 @@ include(CMakePackageConfigHelpers) ...@@ -33,8 +33,8 @@ include(CMakePackageConfigHelpers)
    write_basic_package_version_file( write_basic_package_version_file(
    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
    VERSION ${PROJECT_VERSION} VERSION ${SOURCE_VERSION}
    COMPATIBILITY AnyNewerVersion COMPATIBILITY ExactVersion
    ) )
    configure_package_config_file( configure_package_config_file(
    ...@@ -57,6 +57,6 @@ install( ...@@ -57,6 +57,6 @@ install(
    ) )
    set(CPACK_GENERATOR "TXZ") set(CPACK_GENERATOR "TXZ")
    set(CPACK_PACKAGE_VERSION ${GIT_TAG}) set(CPACK_PACKAGE_VERSION "${SOURCE_VERSION}")
    include(CPack) include(CPack)
    ...@@ -5,7 +5,7 @@ set(target ${PROJECT_NAME}) ...@@ -5,7 +5,7 @@ set(target ${PROJECT_NAME})
    add_library(${target} STATIC) add_library(${target} STATIC)
    if( CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR ) if( CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR )
    find_package(biotracker-interfaces 0.2 REQUIRED) find_package(biotracker-interfaces REQUIRED)
    endif() endif()
    target_link_libraries(${target} biotracker-interfaces) target_link_libraries(${target} biotracker-interfaces)
    ......
    0.2.0
    \ No newline at end of file
    function(add_behavior_plugin target) function(add_behavior_plugin target)
    exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "log --pretty=format:%h -n 1" OUTPUT_VARIABLE GIT_HASH)
    if("$ENV{USERNAME}" STREQUAL "ContainerAdministrator") if("$ENV{USERNAME}" STREQUAL "ContainerAdministrator")
    # Note: This is a workaround for Qt5's "moc" in Windows Docker getting # Note: This is a workaround for Qt5's "moc" in Windows Docker getting
    # "System cannot find the file" errors when trying to read # "System cannot find the file" errors when trying to read
    ...@@ -13,8 +11,6 @@ function(add_behavior_plugin target) ...@@ -13,8 +11,6 @@ function(add_behavior_plugin target)
    add_library (${target} MODULE ${ARGN}) add_library (${target} MODULE ${ARGN})
    target_compile_definitions(${target} PRIVATE CURRENT_GIT_HASH="${GIT_HASH}")
    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/plugin.json.in ${METADATA_DIR}/plugin.json) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/plugin.json.in ${METADATA_DIR}/plugin.json)
    target_include_directories(${target} PRIVATE ${METADATA_DIR}) target_include_directories(${target} PRIVATE ${METADATA_DIR})
    ......
    @PACKAGE_INIT@ @PACKAGE_INIT@
    find_package(biotracker-interfaces 0.2 REQUIRED) find_package(biotracker-interfaces REQUIRED)
    include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake) include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment