Updated glslang, SPIRV-Cross, and SPIRV-Tools.

Fixed usage of dynamic libraries for Boost on Windows that spontaneously
broke. (likely due to a CMake change)

Author: akb825

CMakeLists.txt

@@ -46,8 +46,10 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 if (MSL_SHARED)
 	set(MSL_LIB SHARED)
+	set(Boost_USE_STATIC_LIBS OFF)
 else()
 	set(MSL_LIB STATIC)
+	set(Boost_USE_STATIC_LIBS ON)
 endif()
 
 if (MSL_OUTPUT_DIR)
@@ -58,7 +60,7 @@ endif()
 
 set(MSL_MAJOR_VERSION 1)
 set(MSL_MINOR_VERSION 4)
-set(MSL_PATCH_VERSION 3)
+set(MSL_PATCH_VERSION 4)
 set(MSL_VERSION ${MSL_MAJOR_VERSION}.${MSL_MINOR_VERSION}.${MSL_PATCH_VERSION})
 
 set(MSL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

Compile/CMakeLists.txt

@@ -1,6 +1,3 @@
-if (NOT MSL_SHARED)
-	set(Boost_USE_STATIC_LIBS ON)
-endif()
 find_package(Boost COMPONENTS system thread filesystem wave REQUIRED)
 find_package(Threads)
 
@@ -64,6 +61,7 @@ target_include_directories(msl_compile
 			src)
 target_link_libraries(msl_compile
 	PRIVATE SPIRV-Tools-opt ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+target_compile_definitions(msl_compile PRIVATE BOOST_ALL_NO_LIB)
 
 msl_set_folder(msl_compile libs)
 msl_setup_filters(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src

Compile/SPIRV-Cross

@@ -21,6 +21,7 @@ target_include_directories(msl_compile_test
 	PRIVATE ${GTEST_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GLSLANG_DIR} ${SPIRV_CROSS_DIR} ../src)
 target_link_libraries(msl_compile_test
 	PRIVATE msl_compile ${Boost_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+target_compile_definitions(msl_compile_test PRIVATE BOOST_ALL_NO_LIB)
 
 msl_set_folder(msl_compile_test tests)
 add_test(NAME MSLCompileTest COMMAND msl_compile_test)

Compile/SPIRV-Tools

@@ -1,15 +1,13 @@
-if (NOT MSL_SHARED)
-	set(Boost_USE_STATIC_LIBS ON)
-endif()
 find_package(Boost COMPONENTS system program_options filesystem)
 
 file(GLOB_RECURSE sources *.cpp *.h)
 add_executable(mslb-extract ${sources})
 
 target_include_directories(mslb-extract PRIVATE ${Boost_INCLUDE_DIRS})
 target_link_libraries(mslb-extract PRIVATE msl_client ${Boost_LIBRARIES})
-target_compile_definitions(mslb-extract PRIVATE MSL_MAJOR_VERSION=${MSL_MAJOR_VERSION}
-	MSL_MINOR_VERSION=${MSL_MINOR_VERSION} MSL_PATCH_VERSION=${MSL_PATCH_VERSION})
+target_compile_definitions(mslb-extract PRIVATE BOOST_ALL_NO_LIB
+	MSL_MAJOR_VERSION=${MSL_MAJOR_VERSION} MSL_MINOR_VERSION=${MSL_MINOR_VERSION}
+	MSL_PATCH_VERSION=${MSL_PATCH_VERSION})
 
 msl_set_folder(mslb-extract tools)
 

Compile/glslang

@@ -1,15 +1,13 @@
-if (NOT MSL_SHARED)
-	set(Boost_USE_STATIC_LIBS ON)
-endif()
 find_package(Boost COMPONENTS system program_options)
 
 file(GLOB_RECURSE sources *.cpp *.h)
 add_executable(mslc ${sources})
 
 target_include_directories(mslc PRIVATE ${Boost_INCLUDE_DIRS})
 target_link_libraries(mslc PRIVATE msl_compile ${Boost_LIBRARIES})
-target_compile_definitions(mslc PRIVATE MSL_MAJOR_VERSION=${MSL_MAJOR_VERSION}
-	MSL_MINOR_VERSION=${MSL_MINOR_VERSION} MSL_PATCH_VERSION=${MSL_PATCH_VERSION})
+target_compile_definitions(mslc PRIVATE BOOST_ALL_NO_LIB
+	MSL_MAJOR_VERSION=${MSL_MAJOR_VERSION} MSL_MINOR_VERSION=${MSL_MINOR_VERSION}
+	MSL_PATCH_VERSION=${MSL_PATCH_VERSION})
 
 msl_set_folder(mslc tools)