Skip to content

Commit df935c9

Browse files
committed
fix static builds - boost corrections and adjustments
1 parent e391e99 commit df935c9

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

3rdparty/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ set(NBL_3RDPARTY_TARGETS
357357
SPIRV-Tools-opt
358358
Imath
359359
OpenEXRCore
360+
${NBL_BOOST_TARGETS}
360361
)
361362
if (_NBL_COMPILE_WITH_OPEN_EXR_)
362363
list(APPEND NBL_3RDPARTY_TARGETS

3rdparty/boost/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,16 @@ endforeach()
3232

3333
add_subdirectory(superproject/libs/wave EXCLUDE_FROM_ALL)
3434

35+
foreach(BOOST_LIB IN LISTS NBL_BOOST_LIBS)
36+
if(TARGET boost_${BOOST_LIB})
37+
list(APPEND NBL_BOOST_TARGETS boost_${BOOST_LIB})
38+
endif()
39+
endforeach()
40+
41+
set(NBL_BOOST_TARGETS
42+
${NBL_BOOST_TARGETS}
43+
PARENT_SCOPE)
44+
3545
# Boost uses it's own tool for generating dependency list for targets, therefore we
3646
# can make sure manually added dependnecy subdirectories for a library are valid
3747
# https://www.boost.org/doc/libs/1_83_0/tools/boostdep/doc/html/index.html#boostdep.introduction.building_boostdep

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)