Merge pull request #609 from Devsh-Graphics-Programming/cad_shaders_work_cherry_pick

Cherry pick static build commit fixes

Author: AnastaZIuk

3rdparty/CMakeLists.txt

@@ -361,7 +361,8 @@ set(NBL_3RDPARTY_TARGETS
 				GenericCodeGen
 				SPIRV 
 				SPIRV-Tools-static # SPIRV-Tools-shared in case of SHARED lib
-				SPIRV-Tools-opt 
+				SPIRV-Tools-opt
+				${NBL_BOOST_TARGETS}
 )
 if (_NBL_COMPILE_WITH_OPEN_EXR_)
 	list(APPEND NBL_3RDPARTY_TARGETS

3rdparty/boost/CMakeLists.txt

@@ -19,4 +19,16 @@ endif()
 
 set(BOOST_INCLUDE_LIBRARIES wave)
 set(BOOST_STAGEDIR "${CMAKE_CURRENT_BINARY_DIR}/boost/superproject/stage")
-add_subdirectory(superproject superproject EXCLUDE_FROM_ALL)
+add_subdirectory(superproject superproject EXCLUDE_FROM_ALL)
+
+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)
+
+foreach(BOOST_LIB IN LISTS NBL_BOOST_LIBS)
+if(TARGET boost_${BOOST_LIB})
+	list(APPEND NBL_BOOST_TARGETS boost_${BOOST_LIB})
+endif()
+endforeach()
+
+set(NBL_BOOST_TARGETS 
+	${NBL_BOOST_TARGETS}
+PARENT_SCOPE)

CMakeLists.txt

@@ -256,6 +256,7 @@ macro(nbl_adjust_definitions)
 		PNG_NO_MNG_FEATURES
 		_7ZIP_ST
 		SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
+		BOOST_ALL_NO_LIB
 	)
 
 	if(ANDROID)