Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake fixes to allow building this repo as a submodule #25

Merged
merged 2 commits into from
May 30, 2024
Merged

CMake fixes to allow building this repo as a submodule #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e86232
Fix building as submodule
AngheloAlf May 27, 2024
62dce31
Remove building rt64 in favour of consumer's rt64
AngheloAlf May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,3 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)

add_subdirectory(ultramodern)
add_subdirectory(librecomp)

set(RT64_STATIC TRUE)
add_subdirectory(rt64)
6 changes: 3 additions & 3 deletions librecomp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
18 changes: 9 additions & 9 deletions ultramodern/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down