CMakeLists.txt config.h.in kolabformat/kolabobject.h libkolab_config.h.in

[Aaron Seigo]

 CMakeLists.txt            |    3 ++-
 config.h.in               |    4 ----
 kolabformat/kolabobject.h |    2 +-
 libkolab_config.h.in      |    4 ++++
 4 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 220162c184995bdd2b1a662612c33e102831ca3b
Author: Aaron Seigo <aseigo at kde.org>
Date:   Mon Oct 6 10:21:21 2014 +0200

    rename config.h to libkolab_config.h and install
    
    this allows building other modules that use libkolab while preventing
    name collisions due to an overly generic filename for the include

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/config.h.in b/config.h.in
deleted file mode 100644
index 520e892..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,4 +0,0 @@
-/* This file is generated from config.h.cmake. */
-
-/* Whether akonadi/tag.h exists. */
-#cmakedefine HAVE_TAG_H 1
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/libkolab_config.h.in b/libkolab_config.h.in
new file mode 100644
index 0000000..46b59ea
--- /dev/null
+++ b/libkolab_config.h.in
@@ -0,0 +1,4 @@
+/* This file is generated from libkolab_config.h.cmake. */
+
+/* Whether akonadi/tag.h exists. */
+#cmakedefine HAVE_TAG_H 1