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

Use configure_file() for export headers so re-running CMake won't cause
files to be re-built.

Incremented version to 1.4.1.

Author: akb825

CMakeLists.txt

@@ -58,9 +58,11 @@ endif()
 
 set(MSL_MAJOR_VERSION 1)
 set(MSL_MINOR_VERSION 4)
-set(MSL_PATCH_VERSION 0)
+set(MSL_PATCH_VERSION 1)
 set(MSL_VERSION ${MSL_MAJOR_VERSION}.${MSL_MINOR_VERSION}.${MSL_PATCH_VERSION})
 
+set(MSL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
 include(cmake/config.cmake)
 include(cmake/install.cmake)
 

Compile/SPIRV-Cross

@@ -3,6 +3,8 @@ trigger:
 variables:
   - name: cmake.commonArgs
     value: -DCMAKE_FIND_ROOT_PATH=$(dependency.location) -DCMAKE_PREFIX_PATH=$(dependency.location)
+  - name: boost.winVer
+    value: $(BOOST_ROOT_1_72_0)
   - group: Common
 jobs:
   - job: Linux
@@ -193,19 +195,19 @@ jobs:
             win32_static:
                 arch: Win32
                 lib.type: Static
-                cmake.args: -DMSL_SHARED=OFF
+                cmake.args: -DMSL_SHARED=OFF -DBOOST_ROOT=$(boost.winVer)
             win32_shared:
                 arch: Win32
                 lib.type: Shared
-                cmake.args: -DMSL_SHARED=ON
+                cmake.args: -DMSL_SHARED=ON -DBOOST_ROOT=$(boost.winVer)
             win64_static:
                 arch: x64
                 lib.type: Static
-                cmake.args: -DMSL_SHARED=OFF
+                cmake.args: -DMSL_SHARED=OFF -DBOOST_ROOT=$(boost.winVer)
             win64_shared:
                 arch: x64
                 lib.type: Shared
-                cmake.args: -DMSL_SHARED=ON
+                cmake.args: -DMSL_SHARED=ON -DBOOST_ROOT=$(boost.winVer)
     steps:
       - bash: |
             ./update-submodules.sh
@@ -246,7 +248,7 @@ jobs:
         continueOnError: true
         timeoutInMinutes: 5
         env:
-            PATH: $(PATH);$(BOOST_ROOT)\lib
+            PATH: $(PATH);$(boost.winVer)\lib
       - task: PublishTestResults@2
         inputs:
             testResultsFormat: JUnit
@@ -273,7 +275,7 @@ jobs:
         continueOnError: true
         timeoutInMinutes: 5
         env:
-            PATH: $(PATH);$(BOOST_ROOT)\lib
+            PATH: $(PATH);$(boost.winVer)\lib
       - task: PublishTestResults@2
         inputs:
             testResultsFormat: JUnit

Compile/SPIRV-Tools

@@ -1,4 +1,4 @@
-# Copyright 2018 Aaron Barany
+# Copyright 2018-2020 Aaron Barany
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,26 +47,12 @@ function(msl_install_library)
 		if (MSVC)
 			set_property(TARGET ${ARGS_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS
 				MSL_${moduleUpper}_BUILD)
-			file(WRITE ${exportPath}
-				"#pragma once\n\n"
-				"#ifdef MSL_${moduleUpper}_BUILD\n"
-				"#define MSL_${moduleUpper}_EXPORT __declspec(dllexport)\n"
-				"#else\n"
-				"#define MSL_${moduleUpper}_EXPORT __declspec(dllimport)\n"
-				"#endif\n")
-		elseif (CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-			file(WRITE ${exportPath}
-				"#pragma once\n\n"
-				"#define MSL_${moduleUpper}_EXPORT __attribute__((visibility(\"default\")))\n")
+			configure_file(${MSL_SOURCE_DIR}/cmake/templates/WindowsExport.h.in ${exportPath} @ONLY)
 		else()
-			file(WRITE ${exportPath}
-				"#pragma once\n\n"
-				"#define MSL_${moduleUpper}_EXPORT\n")
+			configure_file(${MSL_SOURCE_DIR}/cmake/templates/UnixExport.h.in ${exportPath} @ONLY)
 		endif()
 	else()
-		file(WRITE ${exportPath}
-			"#pragma once\n\n"
-			"#define MSL_${moduleUpper}_EXPORT\n")
+		configure_file(${MSL_SOURCE_DIR}/cmake/templates/NoExport.h.in ${exportPath} @ONLY)
 	endif()
 
 	if (NOT MSL_INSTALL)
@@ -135,8 +121,7 @@ function(msl_install_master_config)
 	else()
 		set(configPackageDir lib/cmake/MSL)
 	endif()
-	file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/cmake/MSLConfig.cmake
-		DESTINATION ${MSL_EXPORTS_DIR})
-	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/MSLConfig.cmake ${versionPath}
+	file(COPY ${MSL_SOURCE_DIR}/cmake/templates/MSLConfig.cmake DESTINATION ${MSL_EXPORTS_DIR})
+	install(FILES ${MSL_SOURCE_DIR}/cmake/templates/MSLConfig.cmake ${versionPath}
 		DESTINATION ${configPackageDir} COMPONENT dev)
 endfunction()

Compile/glslang

@@ -0,0 +1,2 @@
+#pragma once
+#define MSL_@moduleUpper@_EXPORT

azure-pipelines.yml

@@ -0,0 +1,2 @@
+#pragma once
+#define MSL_@moduleUpper@_EXPORT __attribute__((visibility("default")))

cmake/install.cmake

@@ -0,0 +1,6 @@
+#pragma once
+#ifdef MSL_@moduleUpper@_BUILD
+#define MSL_@moduleUpper@_EXPORT __declspec(dllexport)
+#else
+#define MSL_@moduleUpper@_EXPORT __declspec(dllimport)
+#endif