From edaafaae2f83f7f37c98bf2d179f08b3b6a38482 Mon Sep 17 00:00:00 2001 From: Jesse Talavera Date: Mon, 19 Feb 2024 11:41:01 -0500 Subject: [PATCH 1/2] Have dolphin_scmrev run `ScmRevGen` from `CMAKE_CURRENT_SOURCE_DIR` --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f43174bcf..f90545d96f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -788,7 +788,7 @@ if(NOT GIT_FOUND) endif() add_custom_target( dolphin_scmrev - ${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DDISTRIBUTOR=${DISTRIBUTOR} -DDOLPHIN_DEFAULT_UPDATE_TRACK=${DOLPHIN_DEFAULT_UPDATE_TRACK} -DGIT_FOUND=${GIT_FOUND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DDOLPHIN_WC_REVISION=${DOLPHIN_WC_REVISION} -DDOLPHIN_WC_DESCRIBE=${DOLPHIN_WC_DESCRIBE} -DDOLPHIN_WC_BRANCH=${DOLPHIN_WC_BRANCH} -P ${CMAKE_SOURCE_DIR}/CMake/ScmRevGen.cmake + ${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DDISTRIBUTOR=${DISTRIBUTOR} -DDOLPHIN_DEFAULT_UPDATE_TRACK=${DOLPHIN_DEFAULT_UPDATE_TRACK} -DGIT_FOUND=${GIT_FOUND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DDOLPHIN_WC_REVISION=${DOLPHIN_WC_REVISION} -DDOLPHIN_WC_DESCRIBE=${DOLPHIN_WC_DESCRIBE} -DDOLPHIN_WC_BRANCH=${DOLPHIN_WC_BRANCH} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/ScmRevGen.cmake BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h VERBATIM ) From a84dc3123e1e2f586851d6f11b59975d1e6cce24 Mon Sep 17 00:00:00 2001 From: Jesse Talavera Date: Tue, 20 Feb 2024 08:09:06 -0500 Subject: [PATCH 2/2] Use `CMAKE_CURRENT_SOURCE_DIR` for the CMake module path --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f90545d96f..869862eb75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,7 +156,7 @@ if(UNIX) endif() list(APPEND CMAKE_MODULE_PATH - ${CMAKE_SOURCE_DIR}/CMake + ${CMAKE_CURRENT_SOURCE_DIR}/CMake ) # Support functions