From 43491dd34f5d6cd14d70f13577514eccbe662504 Mon Sep 17 00:00:00 2001 From: Mark Mueller Date: Mon, 13 Jun 2016 18:26:30 -0600 Subject: [PATCH] layers: Fix CMakeLists.txt for non-MSVC Win builds Fix a recent change broke windows builds that don't use the VC IDE or decorate build trees like VC does Change-Id: I93c8a559c4255408a6fa890b2a3e4d81822d1cea --- layers/CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 5982cdd..099b711 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -167,9 +167,15 @@ target_include_directories(VkLayer_core_validation PRIVATE ${SPIRV_TOOLS_INCLUDE target_link_libraries(VkLayer_core_validation ${SPIRV_TOOLS_LIBRARIES}) if (WIN32) - file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/$/VkLayer_utils.dll COPY_SRC_PATH) - file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/../demos/$/ COPY_DST_PATH) - file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/../tests/$/ COPY_DST_TEST_PATH) + if (CMAKE_GENERATOR MATCHES "^Visual Studio.*") + file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/$/VkLayer_utils.dll COPY_SRC_PATH) + file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/../demos/$/ COPY_DST_PATH) + file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/../tests/$/ COPY_DST_TEST_PATH) + else() + file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/VkLayer_utils.dll COPY_SRC_PATH) + file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/../demos/ COPY_DST_PATH) + file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/../tests/ COPY_DST_TEST_PATH) + endif() # Copy layer utils library to correct locations add_custom_command(TARGET VkLayer_utils POST_BUILD -- 2.7.4