From 52231c657cb1241cee099ca2626c1eebcc944e4e Mon Sep 17 00:00:00 2001 From: Awais Belal Date: Wed, 17 Aug 2016 13:25:36 +0500 Subject: [PATCH 1/2] obey CMAKE_INSTALL_LIBDIR The CMAKE_INSTALL_* directories provide a mechanism to relocate installations so rather than doing this through hardcoded variable they should be used whereever possible. This fixes installation to required directory. Signed-off-by: Awais Belal --- layers/CMakeLists.txt | 4 ++-- tests/layers/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 076b847..cfab1bf 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -81,7 +81,7 @@ else() target_link_Libraries(VkLayer_${target} VkLayer_utils) add_dependencies(VkLayer_${target} generate_vk_layer_helpers) set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic") - install(TARGETS VkLayer_${target} DESTINATION ${PROJECT_BINARY_DIR}/install_staging) + install(TARGETS VkLayer_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}) endmacro() endif() @@ -148,7 +148,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 ${PROJECT_BINARY_DIR}/install_staging) + 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/tests/layers/CMakeLists.txt b/tests/layers/CMakeLists.txt index 87d7793..f62e054 100644 --- a/tests/layers/CMakeLists.txt +++ b/tests/layers/CMakeLists.txt @@ -49,7 +49,7 @@ else() add_library(VkLayer_${target} SHARED ${ARGN}) add_dependencies(VkLayer_${target} generate_vk_layer_helpers) set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic") - install(TARGETS VkLayer_${target} DESTINATION ${PROJECT_BINARY_DIR}/install_staging) + install(TARGETS VkLayer_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}) endmacro() endif() -- 1.9.1