File tree Expand file tree Collapse file tree 2 files changed +15
-2
lines changed Expand file tree Collapse file tree 2 files changed +15
-2
lines changed Original file line number Diff line number Diff line change 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 )
2
2
3
3
get_filename_component (_BOOST_PREPROCESSOR_BR_BUNDLE_SEARCH_DIRECTORY_ "${BOOST_PREPROCESSOR_INCLUDE} " ABSOLUTE )
4
4
get_filename_component (_BOOST_PREPROCESSOR_BR_OUTPUT_DIRECTORY_SOURCE_ "${CMAKE_CURRENT_BINARY_DIR} /src" ABSOLUTE )
@@ -15,4 +15,8 @@ if(NBL_EMBED_BUILTIN_RESOURCES)
15
15
endforeach ()
16
16
17
17
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 )
Original file line number Diff line number Diff line change @@ -588,6 +588,15 @@ target_compile_definitions(Nabla
588
588
INTERFACE _NBL_PCH_IGNORE_PRIVATE_HEADERS
589
589
)
590
590
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
+
591
600
if (NBL_EMBED_BUILTIN_RESOURCES )
592
601
get_target_property (_NABLA_INCLUDE_DIRECTORIES_ Nabla INCLUDE_DIRECTORIES )
593
602
get_target_property (_DXC_BR_OUTPUT_INCLUDE_SEARCH_DIRECTORY_ dxcBuiltinResourceData BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY )
You can’t perform that action at this time.
0 commit comments