diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | kolabformat/kolabobject.h | 2 | ||||
| -rw-r--r-- | libkolab_config.h.in (renamed from config.h.in) | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 633f1af..1baa147 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,7 +127,7 @@ set(CMAKE_REQUIRED_INCLUDES "/opt/devel/kolab/include/") #we have to make sure that we only search in KDE_INCLUDES though, to not accidentally include a system akonadi/tag.h #when we're searching for one in libcalendaring. find_path(HAVE_TAG_H akonadi/tag.h PATHS ${KDE_INCLUDES} NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libkolab_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/libkolab_config.h) add_subdirectory(kolabformatV2) add_subdirectory(conversion) @@ -190,6 +190,7 @@ install(FILES kolabformat/errorhandler.h kolabformat/xmlobject.h kolabformat/mimeobject.h + ${CMAKE_CURRENT_BINARY_DIR}/libkolab_config.h conversion/kcalconversion.h conversion/kabcconversion.h conversion/commonconversion.h diff --git a/kolabformat/kolabobject.h b/kolabformat/kolabobject.h index 48f83d7..9edbfd3 100644 --- a/kolabformat/kolabobject.h +++ b/kolabformat/kolabobject.h @@ -20,7 +20,7 @@ #include <kolab_export.h> -#include "config.h" +#include <libkolab_config.h> #ifdef HAVE_TAG_H #include <akonadi/tag.h> diff --git a/config.h.in b/libkolab_config.h.in index 520e892..46b59ea 100644 --- a/config.h.in +++ b/libkolab_config.h.in @@ -1,4 +1,4 @@ -/* This file is generated from config.h.cmake. */ +/* This file is generated from libkolab_config.h.cmake. */ /* Whether akonadi/tag.h exists. */ #cmakedefine HAVE_TAG_H 1 |