diff options
| author | 2022-09-16 12:48:53 -0400 | |
|---|---|---|
| committer | 2022-09-16 12:48:53 -0400 | |
| commit | 8dafe15600d82094dbbba207cb6f565cce28e0fd (patch) | |
| tree | 9c65af3ea981308d1fc1c8e77682641c43fcd6c0 | |
| parent | Merge pull request #8682 from lat9nq/dumpy (diff) | |
| parent | common: Use PROJECT_SOURCE_DIR to find CMakeModules (diff) | |
| download | yuzu-8dafe15600d82094dbbba207cb6f565cce28e0fd.tar.gz yuzu-8dafe15600d82094dbbba207cb6f565cce28e0fd.tar.xz yuzu-8dafe15600d82094dbbba207cb6f565cce28e0fd.zip | |
Merge pull request #8649 from lat9nq/common-position-independent
common: Use PROJECT_SOURCE_DIR to find CMakeModules
| -rw-r--r-- | src/common/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index b1e0ba6cc..68436a4bc 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -19,7 +19,7 @@ find_package(Git QUIET) | |||
| 19 | 19 | ||
| 20 | add_custom_command(OUTPUT scm_rev.cpp | 20 | add_custom_command(OUTPUT scm_rev.cpp |
| 21 | COMMAND ${CMAKE_COMMAND} | 21 | COMMAND ${CMAKE_COMMAND} |
| 22 | -DSRC_DIR=${CMAKE_SOURCE_DIR} | 22 | -DSRC_DIR=${PROJECT_SOURCE_DIR} |
| 23 | -DBUILD_REPOSITORY=${BUILD_REPOSITORY} | 23 | -DBUILD_REPOSITORY=${BUILD_REPOSITORY} |
| 24 | -DTITLE_BAR_FORMAT_IDLE=${TITLE_BAR_FORMAT_IDLE} | 24 | -DTITLE_BAR_FORMAT_IDLE=${TITLE_BAR_FORMAT_IDLE} |
| 25 | -DTITLE_BAR_FORMAT_RUNNING=${TITLE_BAR_FORMAT_RUNNING} | 25 | -DTITLE_BAR_FORMAT_RUNNING=${TITLE_BAR_FORMAT_RUNNING} |
| @@ -31,13 +31,13 @@ add_custom_command(OUTPUT scm_rev.cpp | |||
| 31 | -DGIT_BRANCH=${GIT_BRANCH} | 31 | -DGIT_BRANCH=${GIT_BRANCH} |
| 32 | -DBUILD_FULLNAME=${BUILD_FULLNAME} | 32 | -DBUILD_FULLNAME=${BUILD_FULLNAME} |
| 33 | -DGIT_EXECUTABLE=${GIT_EXECUTABLE} | 33 | -DGIT_EXECUTABLE=${GIT_EXECUTABLE} |
| 34 | -P ${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake | 34 | -P ${PROJECT_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake |
| 35 | DEPENDS | 35 | DEPENDS |
| 36 | # Check that the scm_rev files haven't changed | 36 | # Check that the scm_rev files haven't changed |
| 37 | "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" | 37 | "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" |
| 38 | "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.h" | 38 | "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.h" |
| 39 | # technically we should regenerate if the git version changed, but its not worth the effort imo | 39 | # technically we should regenerate if the git version changed, but its not worth the effort imo |
| 40 | "${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake" | 40 | "${PROJECT_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake" |
| 41 | VERBATIM | 41 | VERBATIM |
| 42 | ) | 42 | ) |
| 43 | 43 | ||