From eb6e700a9599ae23fa8d19913a5527fcde03700b Mon Sep 17 00:00:00 2001 From: Michele Calgaro <michele.calgaro@yahoo.it> Date: Mon, 1 Jul 2024 19:19:48 +0900 Subject: Replace kdemacros.h with tdemacros.h Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit af6b4702933770f5fa073e4d5ef0ee3a5f0b5f1b) --- ConfigureChecks.cmake | 8 -------- libkipi/libkipi/libkipi_export.h.cmake | 10 +--------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 2029ae6..d1e3778 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -23,11 +23,3 @@ tde_setup_largefiles( ) if( WITH_GCC_VISIBILITY ) tde_setup_gcc_visibility( ) endif( WITH_GCC_VISIBILITY ) - - -##### check for <kdemacros.h> header - -tde_save( CMAKE_REQUIRED_INCLUDES ) -list( APPEND CMAKE_REQUIRED_INCLUDES "${TDE_INCLUDE_DIR}" ) -check_include_file( "kdemacros.h" KDEMACROS_USABLE ) -tde_restore( CMAKE_REQUIRED_INCLUDES ) diff --git a/libkipi/libkipi/libkipi_export.h.cmake b/libkipi/libkipi/libkipi_export.h.cmake index 8870334..0b1f5af 100644 --- a/libkipi/libkipi/libkipi_export.h.cmake +++ b/libkipi/libkipi/libkipi_export.h.cmake @@ -21,17 +21,9 @@ #ifndef _LIBKIPI_EXPORT_H #define _LIBKIPI_EXPORT_H -#cmakedefine KDEMACROS_USABLE @KDEMACROS_USABLE@ +#include <tdemacros.h> -#ifdef KDEMACROS_USABLE -#include <kdemacros.h> -#endif - -#ifdef TDE_EXPORT #define LIBKIPI_EXPORT TDE_EXPORT -#else -#define LIBKIPI_EXPORT -#endif #endif /* _LIBKIPI_EXPORT_H */ -- cgit v1.2.1