From d28dc745bc6cfe1a5d5b6859c22df97df6864a3e Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Tue, 12 Jul 2022 12:09:55 -0400 Subject: [PATCH] buildsystem - InstallLocation.cmake -> KDInstallLocation.cmake --- .krazy | 2 +- CMakeLists.txt | 3 +-- .../modules/KDInstallLocation.cmake} | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) rename cmake/{InstallLocation.cmake => KDAB/modules/KDInstallLocation.cmake} (87%) diff --git a/.krazy b/.krazy index 3e9b8844..8b2321dd 100644 --- a/.krazy +++ b/.krazy @@ -22,4 +22,4 @@ SKIP /KDDockWidgetsConfig.cmake.in SKIP CMakePresets.json SKIP \.cmake-format\.py #skip the borrowed code in the cmake subdir -SKIP /cmake/InstallLocation.cmake|/cmake/ECM/|/cmake/KDAB/ +SKIP /cmake/ECM/|/cmake/KDAB/ diff --git a/CMakeLists.txt b/CMakeLists.txt index df60e599..64e775a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,7 +122,6 @@ option(${PROJECT_NAME}_X11EXTRAS ) option(${PROJECT_NAME}_XLib "On Linux, link against XLib, for a more robust window z-order detection." OFF) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/ECM/modules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/KDAB/modules") @@ -271,7 +270,7 @@ if(KDAB_INSTALL) endif() # setup default install locations -include(InstallLocation) +include(KDInstallLocation) if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) set(${PROJECT_NAME}_IS_ROOT_PROJECT TRUE) diff --git a/cmake/InstallLocation.cmake b/cmake/KDAB/modules/KDInstallLocation.cmake similarity index 87% rename from cmake/InstallLocation.cmake rename to cmake/KDAB/modules/KDInstallLocation.cmake index 4b20c980..9f3cc653 100644 --- a/cmake/InstallLocation.cmake +++ b/cmake/KDAB/modules/KDInstallLocation.cmake @@ -1,3 +1,9 @@ +# +# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company +# +# SPDX-License-Identifier: BSD-3-Clause +# + # Some default installation locations. These should be global, with any project # specific locations added to the end. These paths are all relative to the # install prefix.