Skip to content

Commit f66555d

Browse files
authored
Merge pull request #595 from Devsh-Graphics-Programming/boostWave
Boost Wave
2 parents 2003f34 + 11d70c6 commit f66555d

File tree

5 files changed

+20
-3
lines changed

5 files changed

+20
-3
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,6 @@
9696
[submodule "tests"]
9797
path = tests
9898
url = git@github.com:Devsh-Graphics-Programming/Nabla-Continous-Integration-Python-Framework.git
99+
[submodule "3rdparty/boost/superproject"]
100+
path = 3rdparty/boost/superproject
101+
url = git@github.com:boostorg/boost.git

3rdparty/boost/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(BOOST_PREPROCESSOR_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/preprocessor/include" CACHE PATH "" FORCE)
1+
set(BOOST_PREPROCESSOR_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/superproject/libs/preprocessor/include" CACHE PATH "" FORCE)
22

33
get_filename_component(_BOOST_PREPROCESSOR_BR_BUNDLE_SEARCH_DIRECTORY_ "${BOOST_PREPROCESSOR_INCLUDE}" ABSOLUTE)
44
get_filename_component(_BOOST_PREPROCESSOR_BR_OUTPUT_DIRECTORY_SOURCE_ "${CMAKE_CURRENT_BINARY_DIR}/src" ABSOLUTE)
@@ -15,4 +15,8 @@ if(NBL_EMBED_BUILTIN_RESOURCES)
1515
endforeach()
1616

1717
ADD_CUSTOM_BUILTIN_RESOURCES(boostBuiltinResourceData BOOST_RESOURCES_TO_EMBED "${_BOOST_PREPROCESSOR_BR_BUNDLE_SEARCH_DIRECTORY_}" "boost" "boost::builtin" "${_BOOST_PREPROCESSOR_BR_OUTPUT_DIRECTORY_HEADER_}" "${_BOOST_PREPROCESSOR_BR_OUTPUT_DIRECTORY_HEADER_}" "STATIC" "INTERNAL")
18-
endif()
18+
endif()
19+
20+
set(BOOST_INCLUDE_LIBRARIES wave)
21+
set(BOOST_STAGEDIR "${CMAKE_CURRENT_BINARY_DIR}/boost/superproject/stage")
22+
add_subdirectory(superproject superproject EXCLUDE_FROM_ALL)

3rdparty/boost/superproject

Submodule superproject added at 1c4d353

src/nbl/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,15 @@ target_compile_definitions(Nabla
588588
INTERFACE _NBL_PCH_IGNORE_PRIVATE_HEADERS
589589
)
590590

591+
# Boost
592+
add_dependencies(Nabla boost_wave)
593+
target_include_directories(Nabla PUBLIC $<TARGET_PROPERTY:boost_wave,INCLUDE_DIRECTORIES>)
594+
if(NBL_STATIC_BUILD)
595+
target_link_libraries(Nabla INTERFACE boost_wave)
596+
else()
597+
target_link_libraries(Nabla PRIVATE boost_wave)
598+
endif()
599+
591600
if(NBL_EMBED_BUILTIN_RESOURCES)
592601
get_target_property(_NABLA_INCLUDE_DIRECTORIES_ Nabla INCLUDE_DIRECTORIES)
593602
get_target_property(_DXC_BR_OUTPUT_INCLUDE_SEARCH_DIRECTORY_ dxcBuiltinResourceData BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY)

0 commit comments

Comments
 (0)