diff options
| author | John Zupin <johnz@lunarg.com> | 2016-10-27 13:15:27 -0600 |
|---|---|---|
| committer | Karl Schultz <karl@lunarg.com> | 2016-10-27 17:14:46 -0600 |
| commit | f4d933cdc75ec5d7c9db21a1080ff10bf2d16a06 (patch) | |
| tree | 14667a9de04576343557fc44929b0d5ba3c70626 | |
| parent | 1fc9abd7d70166f72b44f7ea554ae80472003ed2 (diff) | |
| download | usermoji-f4d933cdc75ec5d7c9db21a1080ff10bf2d16a06.tar.xz | |
build: Update cmake files to use variables as destinations for make install
Change-Id: Ic1d6ebdb73e796cbb1207963973e410c9928c04f
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | demos/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | layers/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | loader/CMakeLists.txt | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 34bbf9ab..4cd4d30d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -289,7 +289,7 @@ if(NOT WIN32) endif() if(UNIX) - install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/vulkan" DESTINATION include) + install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) endif() # loader: Generic VULKAN ICD loader diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index c19c0448..0f8c6dc8 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -132,5 +132,5 @@ if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) endif() if(UNIX) - install(TARGETS vulkaninfo DESTINATION bin) + install(TARGETS vulkaninfo DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 711da11e..2af4e606 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -72,7 +72,7 @@ if(UNIX) VERBATIM DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json DESTINATION /etc/vulkan/explicit_layer.d) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/vulkan/explicit_layer.d) endforeach(config_file) endif() @@ -92,7 +92,7 @@ else() target_link_Libraries(VkLayer_${target} VkLayer_utils) add_dependencies(VkLayer_${target} generate_dispatch_table_helper generate_vk_layer_helpers generate_enum_string_helper VkLayer_utils) set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic,--exclude-libs,ALL") - install(TARGETS VkLayer_${target} DESTINATION lib) + install(TARGETS VkLayer_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}) endmacro() endif() @@ -185,7 +185,7 @@ if (WIN32) add_library(VkLayer_utils STATIC vk_layer_config.cpp vk_layer_extension_utils.cpp vk_layer_utils.cpp) else() add_library(VkLayer_utils SHARED vk_layer_config.cpp vk_layer_extension_utils.cpp vk_layer_utils.cpp) - install(TARGETS VkLayer_utils DESTINATION lib) + install(TARGETS VkLayer_utils DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() add_vk_layer(core_validation core_validation.cpp vk_layer_table.cpp vk_safe_struct.cpp descriptor_sets.cpp) diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 793dccc8..411e557c 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -85,5 +85,5 @@ else() add_library(vulkan SHARED ${LOADER_SRCS}) set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "1.0.31") target_link_libraries(vulkan -ldl -lpthread -lm) - install(TARGETS vulkan LIBRARY DESTINATION lib) + install(TARGETS vulkan LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() |