From 6dce8c2fc288934b878cb459f952eabba784719d Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Thu, 30 May 2024 03:16:07 -0400 Subject: [PATCH] CMake fixes to allow building this repo as a submodule (#25) --- CMakeLists.txt | 3 --- librecomp/CMakeLists.txt | 6 +++--- ultramodern/CMakeLists.txt | 18 +++++++++--------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22b1502..3ad8355 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,3 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) add_subdirectory(ultramodern) add_subdirectory(librecomp) - -set(RT64_STATIC TRUE) -add_subdirectory(rt64) diff --git a/librecomp/CMakeLists.txt b/librecomp/CMakeLists.txt index 745769a..1405045 100644 --- a/librecomp/CMakeLists.txt +++ b/librecomp/CMakeLists.txt @@ -31,11 +31,11 @@ add_library(librecomp STATIC target_include_directories(librecomp PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" - "${CMAKE_SOURCE_DIR}/ultramodern/include" - "${CMAKE_SOURCE_DIR}/thirdparty/concurrentqueue" + "${PROJECT_SOURCE_DIR}/../ultramodern/include" + "${PROJECT_SOURCE_DIR}/../thirdparty/concurrentqueue" ) target_include_directories(librecomp PRIVATE - "${CMAKE_SOURCE_DIR}/rt64/src/contrib" + "${PROJECT_SOURCE_DIR}/../rt64/src/contrib" ) target_compile_options(librecomp PRIVATE -Wno-deprecated-declarations) diff --git a/ultramodern/CMakeLists.txt b/ultramodern/CMakeLists.txt index bc16dc0..1b62ca9 100644 --- a/ultramodern/CMakeLists.txt +++ b/ultramodern/CMakeLists.txt @@ -24,8 +24,8 @@ add_library(ultramodern STATIC target_include_directories(ultramodern PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include/" - "${CMAKE_SOURCE_DIR}/thirdparty/concurrentqueue" - "${CMAKE_SOURCE_DIR}/thirdparty/sse2neon" + "${PROJECT_SOURCE_DIR}/../thirdparty/concurrentqueue" + "${PROJECT_SOURCE_DIR}/../thirdparty/sse2neon" ) target_include_directories(ultramodern PRIVATE @@ -34,13 +34,13 @@ target_include_directories(ultramodern PRIVATE # TODO: remove when rt64 is no longer a hard dependency target_include_directories(ultramodern PRIVATE - "${CMAKE_SOURCE_DIR}/rt64/src" - "${CMAKE_SOURCE_DIR}/rt64/src/contrib" - "${CMAKE_SOURCE_DIR}/rt64/src/contrib/hlslpp/include" - "${CMAKE_SOURCE_DIR}/rt64/src/contrib/dxc/inc" - "${CMAKE_SOURCE_DIR}/rt64/src/rhi" - "${CMAKE_SOURCE_DIR}/rt64/src/render" - "${CMAKE_SOURCE_DIR}/rt64/src/contrib/nativefiledialog-extended/src/include" + "${PROJECT_SOURCE_DIR}/../rt64/src" + "${PROJECT_SOURCE_DIR}/../rt64/src/contrib" + "${PROJECT_SOURCE_DIR}/../rt64/src/contrib/hlslpp/include" + "${PROJECT_SOURCE_DIR}/../rt64/src/contrib/dxc/inc" + "${PROJECT_SOURCE_DIR}/../rt64/src/rhi" + "${PROJECT_SOURCE_DIR}/../rt64/src/render" + "${PROJECT_SOURCE_DIR}/../rt64/src/contrib/nativefiledialog-extended/src/include" ) # TODO: remove when librecomp is untangled from ultramodern