Skip to content

Commit 7e1173c

Browse files
committed
fix static builds - boost corrections and adjustments
1 parent dd47412 commit 7e1173c

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

3rdparty/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,8 @@ set(NBL_3RDPARTY_TARGETS
361361
GenericCodeGen
362362
SPIRV
363363
SPIRV-Tools-static # SPIRV-Tools-shared in case of SHARED lib
364-
SPIRV-Tools-opt
364+
SPIRV-Tools-opt
365+
${NBL_BOOST_TARGETS}
365366
)
366367
if (_NBL_COMPILE_WITH_OPEN_EXR_)
367368
list(APPEND NBL_3RDPARTY_TARGETS

3rdparty/boost/CMakeLists.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,16 @@ endif()
1919

2020
set(BOOST_INCLUDE_LIBRARIES wave)
2121
set(BOOST_STAGEDIR "${CMAKE_CURRENT_BINARY_DIR}/boost/superproject/stage")
22-
add_subdirectory(superproject superproject EXCLUDE_FROM_ALL)
22+
add_subdirectory(superproject superproject EXCLUDE_FROM_ALL)
23+
24+
set(NBL_BOOST_LIBS wave;assert;concept_check;config;core;filesystem;format;iterator;lexical_cast;mpl;multi_index;optional;pool;preprocessor;serialization;smart_ptr;spirit;static_assert;throw_exception;type_traits;atomic;container_hash;detail;io;predef;system;winapi;utility;conversion;function_types;fusion;container;integer;numeric/conversion;bind;move;tuple;array;function;mp11;variant;variant2;endian;phoenix;proto;range;regex;thread;typeof;unordered;align;intrusive;describe;functional;chrono;date_time;exception;type_index;ratio;algorithm;tokenizer)
25+
26+
foreach(BOOST_LIB IN LISTS NBL_BOOST_LIBS)
27+
if(TARGET boost_${BOOST_LIB})
28+
list(APPEND NBL_BOOST_TARGETS boost_${BOOST_LIB})
29+
endif()
30+
endforeach()
31+
32+
set(NBL_BOOST_TARGETS
33+
${NBL_BOOST_TARGETS}
34+
PARENT_SCOPE)

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ macro(nbl_adjust_definitions)
256256
PNG_NO_MNG_FEATURES
257257
_7ZIP_ST
258258
SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
259+
BOOST_ALL_NO_LIB
259260
)
260261

261262
if(ANDROID)

0 commit comments

Comments
 (0)