From 3fc6433561725ed114255d2c2e9331a31549cf64 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 14 Aug 2023 20:35:36 +0300 Subject: [PATCH] generic: make it possible to build from the source directory after lots of build system changes (including this commit) it is finally possible Signed-off-by: Ivailo Monev --- CMakeLists.txt | 10 ++-------- KDELibs4Config.cmake => KDELibs4Config.cmake.in | 0 ...nfigVersion.cmake => KDELibs4ConfigVersion.cmake.in | 0 cmake/modules/KDE4Macros.cmake | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) rename KDELibs4Config.cmake => KDELibs4Config.cmake.in (100%) rename KDELibs4ConfigVersion.cmake => KDELibs4ConfigVersion.cmake.in (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a2ff1c0..4f3adc9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -365,12 +365,6 @@ configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h configure_file(config-pty.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-pty.h) configure_file(kdemacros.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h) -################# Disallow in-source build ################# - -if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") - message(SEND_ERROR "kdelibs requires an out of source build") -endif() - ######################################################################### add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) @@ -485,12 +479,12 @@ add_subdirectory( solid ) ################# write kdelibs package config files which will be installed ################# configure_file( - KDELibs4Config.cmake + KDELibs4Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/KDELibs4Config.cmake @ONLY ) configure_file( - KDELibs4ConfigVersion.cmake + KDELibs4ConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/KDELibs4ConfigVersion.cmake @ONLY ) diff --git a/KDELibs4Config.cmake b/KDELibs4Config.cmake.in similarity index 100% rename from KDELibs4Config.cmake rename to KDELibs4Config.cmake.in diff --git a/KDELibs4ConfigVersion.cmake b/KDELibs4ConfigVersion.cmake.in similarity index 100% rename from KDELibs4ConfigVersion.cmake rename to KDELibs4ConfigVersion.cmake.in diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake index 783dc271..0dc87ce0 100644 --- a/cmake/modules/KDE4Macros.cmake +++ b/cmake/modules/KDE4Macros.cmake @@ -317,7 +317,7 @@ macro(KDE4_OPTIONAL_FIND_PACKAGE _PACKAGE) endmacro(KDE4_OPTIONAL_FIND_PACKAGE) # KDE4_TRANSLATE( FILE1.po ... FILEN.po) -# This macro is will create and install translation files +# This macro will create and install translation files macro(KDE4_TRANSLATE _LANGUAGE) foreach(_pofile ${ARGN}) get_filename_component(_abspofile "${_pofile}" ABSOLUTE)