From a36fcab753412a9cbb9c514074ffd9b21cdf4750 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 1 Jul 2024 19:19:39 +0900 Subject: [PATCH] Replace kdemacros.h with tdemacros.h Signed-off-by: Michele Calgaro --- ConfigureChecks.cmake | 8 -------- config.h.cmake | 3 --- libkexiv2/libkexiv2/libkexiv2_export.h | 8 +------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index b582576..31f7d55 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -33,11 +33,3 @@ if( NOT EXIV2_FOUND ) endif( NOT EXIV2_FOUND ) check_include_file_cxx( "exiv2/exiv2.hpp" HAVE_EXIV2_HPP ) - - -##### check for 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/config.h.cmake b/config.h.cmake index 1b91529..36a35f6 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -9,6 +9,3 @@ /* Defined if you have header */ #cmakedefine HAVE_EXIV2_HPP 1 - -/* Defined if you have header */ -#cmakedefine KDEMACROS_USABLE 1 diff --git a/libkexiv2/libkexiv2/libkexiv2_export.h b/libkexiv2/libkexiv2/libkexiv2_export.h index 11b5735..877bdd0 100644 --- a/libkexiv2/libkexiv2/libkexiv2_export.h +++ b/libkexiv2/libkexiv2/libkexiv2_export.h @@ -23,15 +23,9 @@ #ifndef _LIBKEXIV2_EXPORT_H #define _LIBKEXIV2_EXPORT_H -#ifdef KDEMACROS_USABLE -#include -#endif +#include -#ifdef TDE_EXPORT #define LIBKEXIV2_EXPORT TDE_EXPORT -#else -#define LIBKEXIV2_EXPORT -#endif #endif /* _LIBKEXIV2_EXPORT_H */