From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Sat, 28 Apr 2018 16:22:43 +0000 (+0200)
Subject: update cmake to handle VULKAN_SDK environment var
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=9eca1ffd9de3da3814d634a28b10f61b1e43816e;p=jp%2Fvkhelpers.git

update cmake to handle VULKAN_SDK environment var
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dc47c2..5905a40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,15 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
 	ADD_DEFINITIONS (-DDEBUG)
 ENDIF()
 
+set(VULKAN_SDK "$ENV{VULKAN_SDK}" CACHE STRING "LunarG Vulkan SDK path")
+if (VULKAN_SDK)
+		set(ENV{VULKAN_SDK} ${VULKAN_SDK})
+endif ()
+SET(ENV{VK_LAYER_PATH} "${VULKAN_SDK}/etc/explicit_layer.d")
+
+MESSAGE(STATUS "VULKAN_SDK = $ENV{VULKAN_SDK}")
+MESSAGE(STATUS "VK_LAYER_PATH = $ENV{VK_LAYER_PATH}")
+
 FIND_PACKAGE(Vulkan REQUIRED)
 FIND_PACKAGE(GLFW3 REQUIRED)
 
@@ -35,9 +44,10 @@ FUNCTION (setup_lib LibName)
 	TARGET_INCLUDE_DIRECTORIES(${LibName} PRIVATE
 			${CMAKE_CURRENT_SOURCE_DIR}/include
 			${CMAKE_CURRENT_SOURCE_DIR}/src
+			${Vulkan_INCLUDE_DIRS}
 	)
 	TARGET_LINK_LIBRARIES(${LibName}
-		${Vulkan_LIBRARY}
+		${Vulkan_LIBRARIES}
 		${GLFW3_LIBRARY}
 	)
 	INSTALL(TARGETS ${LibName}
diff --git a/src/vkh_app.c b/src/vkh_app.c
index 77096d9..0f7c476 100644
--- a/src/vkh_app.c
+++ b/src/vkh_app.c
@@ -35,11 +35,10 @@ VkhApp vkh_app_create (const char* app_name, int ext_count, const char* extentio
                                 .apiVersion = VK_API_VERSION_1_0};
 #if DEBUG
     const uint32_t enabledLayersCount = 1;
-    //const char* enabledLayers[] = {"VK_LAYER_LUNARG_core_validation"};
     const char* enabledLayers[] = {"VK_LAYER_LUNARG_standard_validation"};
 #else
     const uint32_t enabledLayersCount = 0;
-    const char* enabledLayers[] = NULL;
+    const char* enabledLayers[] = {NULL};
 #endif
 
     VkInstanceCreateInfo inst_info = { .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,