Skip to content

Commit

Permalink
refactor: move streamline includes to forked submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
FlayaN committed Sep 8, 2024
1 parent caf6f4f commit 35ca383
Show file tree
Hide file tree
Showing 21 changed files with 24 additions and 3,651 deletions.
6 changes: 5 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[submodule "extern/CommonLibSSE-NG"]
path = extern/CommonLibSSE-NG
url = https://github.com/alandtse/CommonLibVR.git
url = https://github.com/alandtse/CommonLibVR.git

[submodule "extern/Streamline"]
path = extern/Streamline
url = https://github.com/FlayaN/Streamline.git
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ find_package(cppwinrt CONFIG REQUIRED)
find_package(unordered_dense CONFIG REQUIRED)
find_package(efsw CONFIG REQUIRED)
find_package(Tracy CONFIG REQUIRED)
add_subdirectory(${CMAKE_SOURCE_DIR}/cmake/Streamline)

target_compile_definitions(
${PROJECT_NAME}
Expand Down Expand Up @@ -74,6 +75,7 @@ target_link_libraries(
unordered_dense::unordered_dense
efsw::efsw
Tracy::TracyClient
Streamline
)

# https://gitlab.kitware.com/cmake/cmake/-/issues/24922#note_1371990
Expand Down
10 changes: 10 additions & 0 deletions cmake/Streamline/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
cmake_minimum_required(VERSION 3.21)

add_library(Streamline INTERFACE)

target_include_directories(
Streamline INTERFACE ${CMAKE_SOURCE_DIR}/extern/Streamline/include)

if(MSVC)
target_compile_options(Streamline INTERFACE /wd5103)
endif()
1 change: 1 addition & 0 deletions extern/Streamline
Submodule Streamline added at f465f4
Loading

0 comments on commit 35ca383

Please sign in to comment.