From 8120a6a29a4814b2f60a9998c23a58cc4e29d36a Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 7 Jan 2025 09:29:54 +0100 Subject: [PATCH] Drop extra install rules Signed-off-by: Ilya Lavrenov --- lib/CMakeLists.txt | 14 +++----------- lib/src/Extensions/CMakeLists.txt | 14 +++----------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index dfb336db..17d6530c 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -63,10 +63,9 @@ foreach(UTIL_LIB_NAME IN ITEMS Utils UtilsCpp) install( TARGETS ${UTIL_LIB_TARGET} EXPORT OpenCL${UTIL_LIB_NAME}Targets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT binary + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT binary + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT binary + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT binary ) install( DIRECTORY include/CL/Utils @@ -114,13 +113,6 @@ foreach(UTIL_LIB_NAME IN ITEMS Utils UtilsCpp) DESTINATION ${config_package_location} COMPONENT binary ) - - # For packaging the utils libraries - install( - TARGETS ${UTIL_LIB_TARGET} - DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT binary - ) endforeach() if(OPENCL_SDK_BUILD_SAMPLES) diff --git a/lib/src/Extensions/CMakeLists.txt b/lib/src/Extensions/CMakeLists.txt index e05d4e74..3678451a 100644 --- a/lib/src/Extensions/CMakeLists.txt +++ b/lib/src/Extensions/CMakeLists.txt @@ -117,10 +117,9 @@ if (OPENCL_EXTENSION_LOADER_INSTALL) install(TARGETS OpenCLExt EXPORT OpenCLExtensionLoaderTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT binary + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT binary + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT binary + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT binary ) export(EXPORT OpenCLExtensionLoaderTargets @@ -151,13 +150,6 @@ if (OPENCL_EXTENSION_LOADER_INSTALL) DESTINATION ${OPENCL_EXTENSION_LOADER_CONFIG_PATH} COMPONENT binary ) - - # For packaging the extensions library - install( - TARGETS OpenCLExt - DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT binary - ) endif() if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)