From 284ab873ea48b62464c82710410024ab8d71b6b6 Mon Sep 17 00:00:00 2001
From: Fabian Sauter <sauter.fabian@mailbox.org>
Date: Thu, 28 Jul 2022 11:54:43 +0200
Subject: [PATCH] Fixed Windows make commands

Signed-off-by: Fabian Sauter <sauter.fabian@mailbox.org>
---
 CMakeLists.txt | 15 ++++++++-------
 Makefile       | 16 ++++++++--------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28ed254e0..587505b68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,13 +116,6 @@ include(cmake/vulkan_shader_compiler.cmake)
 include(FetchContent)
 include(cmake/check_vulkan_version.cmake)
 
-# Vulkan Header
-# We don't import Vulkan library if Android build as it is built dynamically
-# Otherwise it is expected that the Vulkan SDK and dependencies are installed
-if(NOT KOMPUTE_OPT_ANDROID_BUILD)
-    find_package(Vulkan REQUIRED)
-endif()
-
 if(KOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER)
     FetchContent_Declare(vulkan_header GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Headers.git
         GIT_TAG ${KOMPUTE_OPT_BUILT_IN_VULKAN_HEADER_TAG}) # Source: https://github.com/KhronosGroup/Vulkan-Headers/tags
@@ -139,6 +132,14 @@ else()
     endif()
 endif()
 
+# Vulkan Header
+# We don't import Vulkan library if Android build as it is built dynamically
+# Otherwise it is expected that the Vulkan SDK and dependencies are installed
+# Has to happen AFTER using the build in vulkan headers to prevent multiple targets with the name Vulkan::Headers
+if(NOT KOMPUTE_OPT_ANDROID_BUILD)
+    find_package(Vulkan REQUIRED)
+endif()
+
 # Spdlog
 if(KOMPUTE_OPT_USE_SPDLOG)
     add_compile_definitions(KOMPUTE_OPT_USE_SPDLOG=1)
diff --git a/Makefile b/Makefile
index ca62922e0..be34230ac 100644
--- a/Makefile
+++ b/Makefile
@@ -78,8 +78,7 @@ mk_build_kompute:
 	cmake --build build/. --target kompute --parallel
 
 mk_build_tests:
-	cmake --build build/. --target kompute_tests \
-								   --parallel
+	cmake --build build/. --target kompute_tests --parallel
 
 mk_run_docs: mk_build_docs
 	(cd build/docs/sphinx && python2.7 -m SimpleHTTPServer)
@@ -120,22 +119,23 @@ vs_cmake:
 		-DKOMPUTE_OPT_BUILD_SHADERS=ON \
 		-DKOMPUTE_OPT_CODE_COVERAGE=OFF \
 		-DKOMPUTE_OPT_BUILD_DOCS=OFF \
-		-G "Visual Studio 16 2019"
+		-G "Visual Studio 16 2019" \
+		-DCMAKE_BUILD_TYPE=$(VS_BUILD_TYPE)
 
 vs_build_all:
-	$(MSBUILD_BIN) build/kompute.sln -p:Configuration$(VS_BUILD_TYPE)
+	cmake --build build/. --parallel
 
 vs_build_docs:
-	$(MSBUILD_BIN) build/docs/gendocsall.vcxproj -p:Configuration=$(VS_BUILD_TYPE)
+	cmake --build build/. --target gendocsall --parallel
 
 vs_install_kompute:
-	$(MSBUILD_BIN) build/src/INSTALL.vcxproj -p:Configuration=$(VS_BUILD_TYPE)
+	cmake --build build/. --target install --parallel
 
 vs_build_kompute:
-	$(MSBUILD_BIN) build/src/kompute.vcxproj -p:Configuration=$(VS_BUILD_TYPE)
+	cmake --build build/. --target kompute --parallel
 
 vs_build_tests:
-	$(MSBUILD_BIN) build/test/test_kompute.vcxproj -p:Configuration=$(VS_BUILD_TYPE)
+	cmake --build build/. --target kompute_tests --parallel
 
 vs_run_docs: vs_build_docs
 	(cd build/docs/sphinx && python2.7 -m SimpleHTTPServer)