From c3c8b7083aec545ea0b6fd784f4b418bacd4cec8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 19 May 2021 20:02:24 +0200 Subject: [PATCH] CMake: Remove some dead installation code It was copy-pasted (presumably from plugin handling code) when initially introduced but was never used. Change-Id: I571738b9f5269ca038f5931a773aa5c2c66aafbc Reviewed-by: Joerg Bornemann --- cmake/Qt3rdPartyLibraryHelpers.cmake | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/cmake/Qt3rdPartyLibraryHelpers.cmake b/cmake/Qt3rdPartyLibraryHelpers.cmake index b7fbea62c91..87d1f89183d 100644 --- a/cmake/Qt3rdPartyLibraryHelpers.cmake +++ b/cmake/Qt3rdPartyLibraryHelpers.cmake @@ -87,19 +87,8 @@ function(qt_internal_add_cmake_library target) qt_internal_add_common_qt_library_helper(${target} ${library_helper_args}) - if (NOT arg_ARCHIVE_INSTALL_DIRECTORY AND arg_INSTALL_DIRECTORY) - set(arg_ARCHIVE_INSTALL_DIRECTORY "${arg_INSTALL_DIRECTORY}") - endif() - qt_skip_warnings_are_errors_when_repo_unclean("${target}") - if (arg_INSTALL_DIRECTORY) - set(install_arguments - ARCHIVE_INSTALL_DIRECTORY ${arg_ARCHIVE_INSTALL_DIRECTORY} - INSTALL_DIRECTORY ${arg_INSTALL_DIRECTORY} - ) - endif() - if (arg_OUTPUT_DIRECTORY) set_target_properties(${target} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${arg_OUTPUT_DIRECTORY} @@ -127,7 +116,6 @@ function(qt_internal_add_cmake_library target) MOC_OPTIONS ${arg_MOC_OPTIONS} ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS} DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS} - ${install_arguments} ) endfunction() @@ -177,10 +165,6 @@ function(qt_internal_add_3rdparty_library target) qt_set_common_target_properties(${target}) endif() - if (NOT arg_ARCHIVE_INSTALL_DIRECTORY AND arg_INSTALL_DIRECTORY) - set(arg_ARCHIVE_INSTALL_DIRECTORY "${arg_INSTALL_DIRECTORY}") - endif() - set_target_properties(${target} PROPERTIES _qt_module_interface_name "${target}" ) @@ -234,7 +218,6 @@ function(qt_internal_add_3rdparty_library target) MOC_OPTIONS ${arg_MOC_OPTIONS} ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS} DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS} - ${install_arguments} ) if(NOT BUILD_SHARED_LIBS OR arg_INSTALL)