From b3ad5bc5732deb1766d5dd8b6e7fdd1daef9827a Mon Sep 17 00:00:00 2001
From: Dynamitos <stefan.hoegler@gmail.com>
Date: Wed, 25 Mar 2020 21:29:43 +0100
Subject: [PATCH] Fixing slang on windows build

---
 CMakeLists.txt         | 10 ----------
 cmake-variants.json    |  8 ++++++--
 cmake/SuperBuild.cmake | 19 +++++++++----------
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8d748c..b72c147 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,16 +15,6 @@ set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
 set(RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
 
-# Configuration types
-SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)
-IF(DEFINED CMAKE_BUILD_TYPE AND CMAKE_VERSION VERSION_GREATER "2.8")
-  SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS  ${CMAKE_CONFIGURATION_TYPES})
-ENDIF()
-SET(CMAKE_ARCHITECTURES "x86;x64" CACHE STRING "Architectures" FORCE)
-IF(DEFINED CMAKE_GENERATOR_PLATFORM AND CMAKE_VERSION VERSION_GREATER "2.8")
-  SET_PROPERTY(CACHE CMAKE_GENERATOR_PLATFORM PROPERTY STRINGS ${CMAKE_ARCHITECTURES})
-ENDIF()
-
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_LIB_PREFIX lib)
 
diff --git a/cmake-variants.json b/cmake-variants.json
index 72c0634..2abdaa6 100644
--- a/cmake-variants.json
+++ b/cmake-variants.json
@@ -22,12 +22,16 @@
             "x64": {
                 "short": "x64",
                 "long": "amd64 platform",
-                "CMAKE_GENERATOR_PLATFORM": "x64"
+                "settings": {
+                    "CMAKE_PLATFORM": "x64"
+                }
             },
             "x86": {
                 "short": "x86",
                 "long": "x86 platform",
-                "CMAKE_GENERATOR_PLATFORM": "x86"
+                "settings": {
+                    "CMAKE_PLATFORM": "x86"
+                }
             }
         }
     }
diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake
index 679ed1f..ad379c5 100644
--- a/cmake/SuperBuild.cmake
+++ b/cmake/SuperBuild.cmake
@@ -5,7 +5,7 @@ set_property(DIRECTORY PROPERTY EP_BASE external)
 set(DEPENDENCIES)
 set(EXTRA_CMAKE_ARGS)
 set(DEPENDENT_BINARIES "")
-execute_process(COMMAND git submodule update --init --recursive -- ${CMAKE_SOURCE_DIR})
+#execute_process(COMMAND git submodule update --init --recursive -- ${CMAKE_SOURCE_DIR})
 
 #-------------BOOST----------------
 list(APPEND DEPENDENCIES boost)
@@ -62,22 +62,21 @@ ExternalProject_Add(slang
 	BINARY_DIR ${CMAKE_BINARY_DIR}/lib
 	CONFIGURE_COMMAND ""
 	BUILD_COMMAND devenv /upgrade ${SLANG_ROOT}/source/slang/slang.vcxproj
-		COMMAND msbuild -m /p:WindowsTargetPlatformVersion=10.0 ${SLANG_ROOT}/source/slang/slang.vcxproj
+		COMMAND msbuild -p:Configuration=${CMAKE_BUILD_TYPE} -p:Platform=${CMAKE_PLATFORM} -p:WindowsTargetPlatformVersion=10.0 ${SLANG_ROOT}/source/slang/slang.vcxproj
 	INSTALL_COMMAND "")
+
+	string(TOLOWER bin/windows-${CMAKE_PLATFORM}/${CMAKE_BUILD_TYPE}/slang.dll SLANG_BINARY)
+	string(TOLOWER bin/windows-${CMAKE_PLATFORM}/${CMAKE_BUILD_TYPE}/slang.lib SLANG_LIB_PATH)
+	set(SLANG_LIB_PATH ${SLANG_ROOT}/${SLANG_LIB_PATH})
 elseif(UNIX)
 ExternalProject_Add(slang
 	SOURCE_DIR ${SLANG_ROOT}
 	BINARY_DIR ${CMAKE_BINARY_DIR}/lib
 	CONFIGURE_COMMAND ""
-	BUILD_COMMAND premake5 config=${CMAKE_BUILD_TYPE}_${CMAKE_GENERATOR_PLATFORM}
+	BUILD_COMMAND premake5 config=${CMAKE_BUILD_TYPE}_${CMAKE_PLATFORM}
 	INSTALL_COMMAND "")
-endif()
-if(WIN32)
-	string(TOLOWER bin/windows-${CMAKE_GENERATOR_PLATFORM}/${CMAKE_BUILD_TYPE}/slang.dll SLANG_BINARY)
-	string(TOLOWER bin/windows-${CMAKE_GENERATOR_PLATFORM}/${CMAKE_BUILD_TYPE}/slang.lib SLANG_LIB_PATH)
-	set(SLANG_LIB_PATH ${SLANG_ROOT}/${SLANG_LIB_PATH})
-elseif(UNIX)
-	string(TOLOWER bin/linux-${CMAKE_GENERATOR_PLATFORM}/${CMAKE_BUILD_TYPE}/libslang.so SLANG_BINARY)
+	
+	string(TOLOWER bin/linux-${CMAKE_PLATFORM}/${CMAKE_BUILD_TYPE}/libslang.so SLANG_BINARY)
 	set(SLANG_LIB_PATH)
 endif()