From 4617fda478a97cf6fb29b1959f0a964f3ccc0033 Mon Sep 17 00:00:00 2001 From: unexploredtest Date: Fri, 23 May 2025 23:42:32 +0330 Subject: [PATCH] CMake: Fix relative pathing when project is imported --- Externals/MoltenVK/CMakeLists.txt | 2 +- Externals/mbedtls/3rdparty/CMakeLists.txt | 2 +- Externals/mbedtls/library/CMakeLists.txt | 2 +- Source/Android/jni/CMakeLists.txt | 12 +++--- Source/Core/CMakeLists.txt | 6 +-- Source/Core/Core/CMakeLists.txt | 6 +-- Source/Core/DolphinQt/CMakeLists.txt | 42 +++++++++---------- Source/Core/MacUpdater/CMakeLists.txt | 6 +-- .../Core/VideoBackends/Vulkan/CMakeLists.txt | 6 +-- Source/UnitTests/CMakeLists.txt | 2 +- 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Externals/MoltenVK/CMakeLists.txt b/Externals/MoltenVK/CMakeLists.txt index d4e92ea0dc..aff8df0647 100644 --- a/Externals/MoltenVK/CMakeLists.txt +++ b/Externals/MoltenVK/CMakeLists.txt @@ -8,7 +8,7 @@ ExternalProject_Add(MoltenVK CONFIGURE_COMMAND ${CMAKE_CURRENT_LIST_DIR}/configure.sh ${MOLTENVK_VERSION} - PATCH_COMMAND ${CMAKE_CURRENT_LIST_DIR}/patch.sh ${CMAKE_SOURCE_DIR}/Externals/MoltenVK/patches/ ${MOLTENVK_VERSION} + PATCH_COMMAND ${CMAKE_CURRENT_LIST_DIR}/patch.sh ${PROJECT_SOURCE_DIR}/Externals/MoltenVK/patches/ ${MOLTENVK_VERSION} BUILD_COMMAND make -C macos BUILD_IN_SOURCE ON diff --git a/Externals/mbedtls/3rdparty/CMakeLists.txt b/Externals/mbedtls/3rdparty/CMakeLists.txt index 18945e52ee..bb074c7a07 100644 --- a/Externals/mbedtls/3rdparty/CMakeLists.txt +++ b/Externals/mbedtls/3rdparty/CMakeLists.txt @@ -4,7 +4,7 @@ list (APPEND thirdparty_inc_public) list (APPEND thirdparty_inc) list (APPEND thirdparty_def) -execute_process(COMMAND ${MBEDTLS_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/config.py -f ${CMAKE_CURRENT_SOURCE_DIR}/../include/mbedtls/config.h get MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED RESULT_VARIABLE result) +execute_process(COMMAND ${MBEDTLS_PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/config.py -f ${PROJECT_SOURCE_DIR}/include/mbedtls/config.h get MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED RESULT_VARIABLE result) if(${result} EQUAL 0) add_subdirectory(everest) diff --git a/Externals/mbedtls/library/CMakeLists.txt b/Externals/mbedtls/library/CMakeLists.txt index 51f653540a..d4ebaef13a 100644 --- a/Externals/mbedtls/library/CMakeLists.txt +++ b/Externals/mbedtls/library/CMakeLists.txt @@ -7,7 +7,7 @@ option(LINK_WITH_TRUSTED_STORAGE "Explicitly link mbed TLS library to trusted_st # the library folder is included directly by a parent project, without # including the top level CMakeLists.txt. if(NOT DEFINED MBEDTLS_DIR) - set(MBEDTLS_DIR ${CMAKE_SOURCE_DIR}) + set(MBEDTLS_DIR ${PROJECT_SOURCE_DIR}) endif() set(src_crypto diff --git a/Source/Android/jni/CMakeLists.txt b/Source/Android/jni/CMakeLists.txt index a3a741a433..a3910f05b1 100644 --- a/Source/Android/jni/CMakeLists.txt +++ b/Source/Android/jni/CMakeLists.txt @@ -59,16 +59,16 @@ PRIVATE target_include_directories(main PRIVATE - ${CMAKE_SOURCE_DIR}/Externals/libadrenotools/include - ${CMAKE_SOURCE_DIR}/Externals/VulkanMemoryAllocator/include + ${PROJECT_SOURCE_DIR}/Externals/libadrenotools/include + ${PROJECT_SOURCE_DIR}/Externals/VulkanMemoryAllocator/include ) -file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/) -file(REMOVE_RECURSE ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/Sys/) -file(COPY ${CMAKE_SOURCE_DIR}/Data/Sys DESTINATION ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/) +file(MAKE_DIRECTORY ${PROJECT_SOURCE_DIR}/Source/Android/app/src/main/assets/) +file(REMOVE_RECURSE ${PROJECT_SOURCE_DIR}/Source/Android/app/src/main/assets/Sys/) +file(COPY ${PROJECT_SOURCE_DIR}/Data/Sys DESTINATION ${PROJECT_SOURCE_DIR}/Source/Android/app/src/main/assets/) # Delete folders that aren't used by the Android version of Dolphin -file(REMOVE_RECURSE ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/Sys/Themes/) +file(REMOVE_RECURSE ${PROJECT_SOURCE_DIR}/Source/Android/app/src/main/assets/Sys/Themes/) set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} main) diff --git a/Source/Core/CMakeLists.txt b/Source/Core/CMakeLists.txt index b1c5a3ab17..4a2f644dc5 100644 --- a/Source/Core/CMakeLists.txt +++ b/Source/Core/CMakeLists.txt @@ -69,7 +69,7 @@ if (APPLE AND ENABLE_QT) if (MACOS_CODE_SIGNING) add_custom_command(TARGET build_final_bundle POST_BUILD - COMMAND "${CMAKE_SOURCE_DIR}/Tools/mac-codesign.sh" + COMMAND "${PROJECT_SOURCE_DIR}/Tools/mac-codesign.sh" "-t" "${MACOS_CODE_SIGNING_IDENTITY}" "${DOLPHIN_MAC_BUNDLE}/Contents/Helpers/Dolphin Updater.app") @@ -79,9 +79,9 @@ if (APPLE AND ENABLE_QT) if (MACOS_CODE_SIGNING) add_custom_command(TARGET build_final_bundle POST_BUILD - COMMAND "${CMAKE_SOURCE_DIR}/Tools/mac-codesign.sh" + COMMAND "${PROJECT_SOURCE_DIR}/Tools/mac-codesign.sh" "-t" - "-e" "${CMAKE_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmu$<$:Debug>.entitlements" + "-e" "${PROJECT_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmu$<$:Debug>.entitlements" "${MACOS_CODE_SIGNING_IDENTITY}" "${DOLPHIN_MAC_BUNDLE}") endif() diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 56c8dba3de..603ce6b1f2 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -593,11 +593,11 @@ add_library(core add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/AchievementApprovedHash.h COMMAND ${CMAKE_COMMAND} - -DJSON_FILE=${CMAKE_SOURCE_DIR}/Data/Sys/ApprovedInis.json + -DJSON_FILE=${PROJECT_SOURCE_DIR}/Data/Sys/ApprovedInis.json -DTEMPLATE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/AchievementApprovedHash.h.in -DOUTPUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/AchievementApprovedHash.h - -P ${CMAKE_SOURCE_DIR}/CMake/GenerateAchievementHash.cmake - DEPENDS ${CMAKE_SOURCE_DIR}/Data/Sys/ApprovedInis.json + -P ${PROJECT_SOURCE_DIR}/CMake/GenerateAchievementHash.cmake + DEPENDS ${PROJECT_SOURCE_DIR}/Data/Sys/ApprovedInis.json ${CMAKE_CURRENT_SOURCE_DIR}/AchievementApprovedHash.h.in COMMENT "Generating AchievementApprovedHash.h" ) diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index ad576e58bc..249664a027 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -1,6 +1,6 @@ if (WIN32) - set(DOLPHIN_QT_X64_ROOT "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.8.3/x64") - set(DOLPHIN_QT_ARM64_ROOT "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.8.3/ARM64") + set(DOLPHIN_QT_X64_ROOT "${PROJECT_SOURCE_DIR}/Externals/Qt/Qt6.8.3/x64") + set(DOLPHIN_QT_ARM64_ROOT "${PROJECT_SOURCE_DIR}/Externals/Qt/Qt6.8.3/ARM64") if(_M_ARM_64) set(DOLPHIN_QT_ROOT "${DOLPHIN_QT_ARM64_ROOT}") @@ -519,25 +519,25 @@ if (NOT APPLE AND NOT ANDROID) # Symlink Sys add_custom_command(TARGET dolphin-emu POST_BUILD COMMAND ${CMAKE_COMMAND} - -Dtarget="${CMAKE_SOURCE_DIR}/Data/Sys" + -Dtarget="${PROJECT_SOURCE_DIR}/Data/Sys" -Dlink="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys" - -P="${CMAKE_SOURCE_DIR}/CMake/DolphinSymlinkOrCopy.cmake" + -P="${PROJECT_SOURCE_DIR}/CMake/DolphinSymlinkOrCopy.cmake" ) # Symlink COPYING add_custom_command(TARGET dolphin-emu POST_BUILD COMMAND ${CMAKE_COMMAND} - -Dtarget="${CMAKE_SOURCE_DIR}/COPYING" + -Dtarget="${PROJECT_SOURCE_DIR}/COPYING" -Dlink="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/COPYING" - -P="${CMAKE_SOURCE_DIR}/CMake/DolphinSymlinkOrCopy.cmake" + -P="${PROJECT_SOURCE_DIR}/CMake/DolphinSymlinkOrCopy.cmake" ) # Symlink Licenses dir add_custom_command(TARGET dolphin-emu POST_BUILD COMMAND ${CMAKE_COMMAND} - -Dtarget="${CMAKE_SOURCE_DIR}/LICENSES" + -Dtarget="${PROJECT_SOURCE_DIR}/LICENSES" -Dlink="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Licenses" - -P="${CMAKE_SOURCE_DIR}/CMake/DolphinSymlinkOrCopy.cmake" + -P="${PROJECT_SOURCE_DIR}/CMake/DolphinSymlinkOrCopy.cmake" ) endif() if (WIN32) @@ -546,7 +546,7 @@ if (WIN32) COMMAND ${CMAKE_COMMAND} -Dtarget="${CMAKE_CURRENT_SOURCE_DIR}/qt.conf.win" -Dlink="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf" - -P="${CMAKE_SOURCE_DIR}/CMake/DolphinSymlinkOrCopy.cmake" + -P="${PROJECT_SOURCE_DIR}/CMake/DolphinSymlinkOrCopy.cmake" ) if (ENABLE_AUTOUPDATE) @@ -555,7 +555,7 @@ if (WIN32) COMMAND ${CMAKE_COMMAND} -Dtarget="${CMAKE_BINARY_DIR}/build_info.txt" -Dlink="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/build_info.txt" - -P="${CMAKE_SOURCE_DIR}/CMake/DolphinSymlinkOrCopy.cmake" + -P="${PROJECT_SOURCE_DIR}/CMake/DolphinSymlinkOrCopy.cmake" ) endif() @@ -620,12 +620,12 @@ find_package(Gettext) if(WIN32 AND NOT Gettext_FOUND) message(STATUS "Using Gettext from Externals") - set(GETTEXT_MSGFMT_EXECUTABLE "${CMAKE_SOURCE_DIR}/Externals/gettext/msgfmt.exe") + set(GETTEXT_MSGFMT_EXECUTABLE "${PROJECT_SOURCE_DIR}/Externals/gettext/msgfmt.exe") endif() if(GETTEXT_MSGFMT_EXECUTABLE) - set(pot_file "${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot") - file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po) + set(pot_file "${PROJECT_SOURCE_DIR}/Languages/po/dolphin-emu.pot") + file(GLOB LINGUAS ${PROJECT_SOURCE_DIR}/Languages/po/*.po) target_sources(dolphin-emu PRIVATE ${pot_file} ${LINGUAS}) source_group("Localization" FILES ${LINGUAS}) @@ -670,8 +670,8 @@ if(APPLE) set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/qt.conf" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) # Copy icon into the bundle - target_sources(dolphin-emu PRIVATE "${CMAKE_SOURCE_DIR}/Data/Dolphin.icns") - set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + target_sources(dolphin-emu PRIVATE "${PROJECT_SOURCE_DIR}/Data/Dolphin.icns") + set_source_files_properties("${PROJECT_SOURCE_DIR}/Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) # Manually include plugins find_package(Qt6QMacStylePlugin REQUIRED PATHS ${Qt6Widgets_DIR}) @@ -687,14 +687,14 @@ if(APPLE) set_source_files_properties("${qtmacstyle_location}" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/styles) # Copy resources into the bundle - set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/Data/Sys") - file(GLOB_RECURSE resources RELATIVE "${CMAKE_SOURCE_DIR}/Data" "${CMAKE_SOURCE_DIR}/Data/Sys/*") + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${PROJECT_SOURCE_DIR}/Data/Sys") + file(GLOB_RECURSE resources RELATIVE "${PROJECT_SOURCE_DIR}/Data" "${PROJECT_SOURCE_DIR}/Data/Sys/*") foreach(res ${resources}) - target_sources(dolphin-emu PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}") + target_sources(dolphin-emu PRIVATE "${PROJECT_SOURCE_DIR}/Data/${res}") get_filename_component(resdir "${res}" DIRECTORY) - set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/${res}" PROPERTIES + set_source_files_properties("${PROJECT_SOURCE_DIR}/Data/${res}" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/${resdir}") - source_group("Resources" FILES "${CMAKE_SOURCE_DIR}/Data/${res}") + source_group("Resources" FILES "${PROJECT_SOURCE_DIR}/Data/${res}") endforeach() include(DolphinInjectVersionInfo) @@ -731,7 +731,7 @@ if(APPLE) if(MACOS_CODE_SIGNING) add_custom_command(TARGET dolphin-emu POST_BUILD - COMMAND "${CMAKE_SOURCE_DIR}/Tools/mac-codesign.sh" + COMMAND "${PROJECT_SOURCE_DIR}/Tools/mac-codesign.sh" "-e" "${CMAKE_CURRENT_SOURCE_DIR}/DolphinEmu$<$:Debug>.entitlements" "${MACOS_CODE_SIGNING_IDENTITY}" "$" diff --git a/Source/Core/MacUpdater/CMakeLists.txt b/Source/Core/MacUpdater/CMakeLists.txt index 459531d39a..3e9df466f6 100644 --- a/Source/Core/MacUpdater/CMakeLists.txt +++ b/Source/Core/MacUpdater/CMakeLists.txt @@ -20,8 +20,8 @@ set_target_properties(MacUpdater PROPERTIES OUTPUT_NAME "Dolphin Updater") # Copy icon into the bundle -target_sources(MacUpdater PRIVATE "${CMAKE_SOURCE_DIR}/Data/Dolphin.icns") -set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) +target_sources(MacUpdater PRIVATE "${PROJECT_SOURCE_DIR}/Data/Dolphin.icns") +set_source_files_properties("${PROJECT_SOURCE_DIR}/Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources) target_link_libraries(MacUpdater PRIVATE "-framework Cocoa" @@ -68,7 +68,7 @@ endif() if(MACOS_CODE_SIGNING) add_custom_command(TARGET MacUpdater POST_BUILD - COMMAND "${CMAKE_SOURCE_DIR}/Tools/mac-codesign.sh" + COMMAND "${PROJECT_SOURCE_DIR}/Tools/mac-codesign.sh" "${MACOS_CODE_SIGNING_IDENTITY}" "$" ) diff --git a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt index 5f5583f2b0..e3e29924fc 100644 --- a/Source/Core/VideoBackends/Vulkan/CMakeLists.txt +++ b/Source/Core/VideoBackends/Vulkan/CMakeLists.txt @@ -56,9 +56,9 @@ endif() # Only include the Vulkan headers when building the Vulkan backend target_include_directories(videovulkan PRIVATE - ${CMAKE_SOURCE_DIR}/Externals/Vulkan-Headers/include - ${CMAKE_SOURCE_DIR}/Externals/VulkanMemoryAllocator/include - ${CMAKE_SOURCE_DIR}/Externals/libadrenotools/include + ${PROJECT_SOURCE_DIR}/Externals/Vulkan-Headers/include + ${PROJECT_SOURCE_DIR}/Externals/VulkanMemoryAllocator/include + ${PROJECT_SOURCE_DIR}/Externals/libadrenotools/include ) if(MSVC) diff --git a/Source/UnitTests/CMakeLists.txt b/Source/UnitTests/CMakeLists.txt index 659d9e5b28..f572ab0935 100644 --- a/Source/UnitTests/CMakeLists.txt +++ b/Source/UnitTests/CMakeLists.txt @@ -10,7 +10,7 @@ target_link_libraries(tests PRIVATE fmt::fmt gtest::gtest core uicommon) add_test(NAME tests COMMAND tests) add_custom_command(TARGET tests POST_BUILD COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys" - COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/Data/Sys" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys" + COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/Data/Sys" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys" ) add_dependencies(unittests tests)