Merge pull request #13704 from unexploredtest/cmake_source

CMake: Fix relative pathing when project is imported
This commit is contained in:
Jordan Woyak
2026-11-14 13:49:30 -06:00
committed by GitHub
10 changed files with 43 additions and 43 deletions

View File

@@ -8,7 +8,7 @@ ExternalProject_Add(MoltenVK
CONFIGURE_COMMAND ${CMAKE_CURRENT_LIST_DIR}/configure.sh <LOG_DIR> <SOURCE_DIR> ${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 <SOURCE_DIR> macos
BUILD_IN_SOURCE ON

View File

@@ -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)

View File

@@ -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

View File

@@ -63,16 +63,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)

View File

@@ -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")
@@ -101,9 +101,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$<$<CONFIG:Debug>:Debug>.entitlements"
"-e" "${PROJECT_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmu$<$<CONFIG:Debug>:Debug>.entitlements"
"${MACOS_CODE_SIGNING_IDENTITY}"
"${DOLPHIN_MAC_BUNDLE}")
endif()

View File

@@ -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"
)

View File

@@ -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})
@@ -677,8 +677,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})
@@ -694,14 +694,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)
@@ -738,7 +738,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$<$<CONFIG:Debug>:Debug>.entitlements"
"${MACOS_CODE_SIGNING_IDENTITY}"
"$<TARGET_BUNDLE_DIR:dolphin-emu>"

View File

@@ -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}"
"$<TARGET_BUNDLE_DIR:MacUpdater>"
)

View File

@@ -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)

View File

@@ -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)