diff options
| author | Mark Mueller <markm@lunarg.com> | 2016-04-18 11:04:36 -0600 |
|---|---|---|
| committer | Mark Mueller <markm@lunarg.com> | 2016-05-05 09:38:09 -0600 |
| commit | 6d5f4c6192308664da7848831f4294aa1098ba20 (patch) | |
| tree | 8c92963c3125e875733196291e3df998e41b016e /loader | |
| parent | 81d3ccf77015698bc09c67c22be2e70aa3bb1953 (diff) | |
| download | usermoji-6d5f4c6192308664da7848831f4294aa1098ba20.tar.xz | |
CMakeLists.txt and doc changes for
1) Ninja build and QTCreator IDE support
2) Out of tree builds that aren't based on using update_external_sources and build_windows_target scripts
3) Allowing the developer to use non-default locations for glslang and SPIRV-Tools binaries and sources
4) Fix linux build when developer chooses not to rename SPIRV-Tools to spirv-tools
Change-Id: Ib6118c47dc780e6721ec0538aae1a6ee444eed78
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/CMakeLists.txt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 6082bdaf..4823d217 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -54,9 +54,15 @@ 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>/ COPY_DST_PATH) - file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/../tests/$<CONFIGURATION>/ COPY_DST_TEST_PATH) + if (CMAKE_GENERATOR MATCHES "^Visual Studio.*") + 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>/ COPY_DST_PATH) + file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/../tests/$<CONFIGURATION>/ COPY_DST_TEST_PATH) + else() + file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/vulkan-${MAJOR}.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() add_custom_command(TARGET vulkan-${MAJOR} POST_BUILD COMMAND xcopy /Y /I ${COPY_SRC_PATH} ${COPY_DST_PATH}) add_custom_command(TARGET vulkan-${MAJOR} POST_BUILD |