diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-07-01 19:19:39 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-07-01 23:15:57 +0900 |
| commit | 803a46b6c8ccfd67d8ae6de1b9371125e2a6c03f (patch) | |
| tree | 6d2e082a6d1169c11c5b044eede093e67dd693b0 | |
| parent | 3a295a7978f3a4ff2bc7154b530d49c53c3a3ba7 (diff) | |
| download | libkexiv2-803a46b6c8ccfd67d8ae6de1b9371125e2a6c03f.tar.gz libkexiv2-803a46b6c8ccfd67d8ae6de1b9371125e2a6c03f.zip | |
Replace kdemacros.h with tdemacros.h
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit a36fcab753412a9cbb9c514074ffd9b21cdf4750)
| -rw-r--r-- | ConfigureChecks.cmake | 8 | ||||
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | libkexiv2/libkexiv2/libkexiv2_export.h | 8 |
3 files changed, 1 insertions, 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 <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/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 <exiv2/exiv2.hpp> header */ #cmakedefine HAVE_EXIV2_HPP 1 - -/* Defined if you have <kdemacros.h> 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 <kdemacros.h> -#endif +#include <tdemacros.h> -#ifdef TDE_EXPORT #define LIBKEXIV2_EXPORT TDE_EXPORT -#else -#define LIBKEXIV2_EXPORT -#endif #endif /* _LIBKEXIV2_EXPORT_H */ |