Browse Source
Merge pull request #8649 from lat9nq/common-position-independent
common: Use PROJECT_SOURCE_DIR to find CMakeModules
pull/15/merge
Morph
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
3 deletions
-
src/common/CMakeLists.txt
|
|
|
@ -19,7 +19,7 @@ find_package(Git QUIET) |
|
|
|
|
|
|
|
add_custom_command(OUTPUT scm_rev.cpp |
|
|
|
COMMAND ${CMAKE_COMMAND} |
|
|
|
-DSRC_DIR=${CMAKE_SOURCE_DIR} |
|
|
|
-DSRC_DIR=${PROJECT_SOURCE_DIR} |
|
|
|
-DBUILD_REPOSITORY=${BUILD_REPOSITORY} |
|
|
|
-DTITLE_BAR_FORMAT_IDLE=${TITLE_BAR_FORMAT_IDLE} |
|
|
|
-DTITLE_BAR_FORMAT_RUNNING=${TITLE_BAR_FORMAT_RUNNING} |
|
|
|
@ -31,13 +31,13 @@ add_custom_command(OUTPUT scm_rev.cpp |
|
|
|
-DGIT_BRANCH=${GIT_BRANCH} |
|
|
|
-DBUILD_FULLNAME=${BUILD_FULLNAME} |
|
|
|
-DGIT_EXECUTABLE=${GIT_EXECUTABLE} |
|
|
|
-P ${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake |
|
|
|
-P ${PROJECT_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake |
|
|
|
DEPENDS |
|
|
|
# Check that the scm_rev files haven't changed |
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" |
|
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.h" |
|
|
|
# technically we should regenerate if the git version changed, but its not worth the effort imo |
|
|
|
"${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake" |
|
|
|
"${PROJECT_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake" |
|
|
|
VERBATIM |
|
|
|
) |
|
|
|
|
|
|
|
|
