Skip to content
Snippets Groups Projects
Commit 0b685b81 authored by Marcin Kirsz's avatar Marcin Kirsz
Browse files

Merge branch 'develop' into 'main' 

Build update

See merge request !15
parents c955e8dd 1606658a
No related branches found
No related tags found
1 merge request!15Build update
Pipeline #49369 passed
Stage: build_debug
    Stage: run_unit_tests
      Stage: build_release
        Stage: trigger
          Hide whitespace changes
          Inline Side-by-side
          Showing
          with 1 addition and 3 deletions
          CMakeLists.txt
          + 1
          − 3
          View file @ 0b685b81
          ...@@ -48,11 +48,9 @@ include(FetchContent) ...@@ -48,11 +48,9 @@ include(FetchContent)
          if(DEFINED ENV{CI_COMMIT_REF_NAME}) if(DEFINED ENV{CI_COMMIT_REF_NAME})
          set(GIT_BRANCH "$ENV{CI_COMMIT_REF_NAME}") set(GIT_BRANCH "$ENV{CI_COMMIT_REF_NAME}")
          elseif(DEFINED ENV{READTHEDOCS})
          set(GIT_BRANCH "$ENV{READTHEDOCS_VERSION}")
          else() else()
          execute_process( execute_process(
          COMMAND git rev-parse --symbolic-full-name --abbrev-ref HEAD COMMAND bash -c "git status | grep origin | sed -e 's/.*origin\\///' -e 's/[^a-zA-Z].*//'"
          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
          OUTPUT_VARIABLE GIT_BRANCH OUTPUT_VARIABLE GIT_BRANCH
          OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
          ......
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment