aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Ashburn <jon@lunarg.com>2016-03-25 15:57:50 -0600
committerJon Ashburn <jon@lunarg.com>2016-03-25 16:01:24 -0600
commit990614d7f62b09807eb8d7ec727e5f16acdcf99d (patch)
treeb832856a402ccd84d6897075ffd8252621d1ecda
parent0c3c1514322d1814a31f2781c6e350a402d4ec4f (diff)
downloadusermoji-990614d7f62b09807eb8d7ec727e5f16acdcf99d.tar.xz
cmake: Add post build event for MSVC for vulkan dll copy
This allows the demos and tests directories to find the locally built vulkan-1.dll instead of that installed in the system32 directory. Change-Id: I3177f4ba00d81addbd4df12e1d4f943d95824ff4
-rw-r--r--loader/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index 654c2a2f..2dbb8c18 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -54,6 +54,14 @@ if (WIN32)
add_library(VKstatic.${MAJOR} STATIC $<TARGET_OBJECTS:loader-opt> $<TARGET_OBJECTS:loader-norm>)
set_target_properties(VKstatic.${MAJOR} PROPERTIES OUTPUT_NAME VKstatic.${MAJOR})
target_link_libraries(vulkan-${MAJOR} shlwapi)
+ file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/vulkan-${MAJOR}.dll COPY_SRC_PATH)
+ file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/../demos/$<CONFIGURATION>/vulkan-${MAJOR}.dll COPY_DST_PATH)
+ file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/../tests/$<CONFIGURATION>/vulkan-${MAJOR}.dll COPY_DST_TEST_PATH)
+ add_custom_command(TARGET vulkan-${MAJOR} POST_BUILD
+ COMMAND copy /Y ${COPY_SRC_PATH} ${COPY_DST_PATH})
+ add_custom_command(TARGET vulkan-${MAJOR} POST_BUILD
+ COMMAND copy /Y ${COPY_SRC_PATH} ${COPY_DST_TEST_PATH})
+
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")