summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kdecore/CMakeLists.txt2
-rw-r--r--kdecore/includes/CMakeLists.txt33
-rw-r--r--kdecore/includes/KDE/KCalendarSystem1
-rw-r--r--kdecore/includes/KDE/KCodecs1
-rw-r--r--kdecore/includes/KDE/KConfig1
-rw-r--r--kdecore/includes/KDE/KConfigGroup1
-rw-r--r--kdecore/includes/KDE/KDateTime1
-rw-r--r--kdecore/includes/KDE/KDebug1
-rw-r--r--kdecore/includes/KDE/KGlobal1
-rw-r--r--kdecore/includes/KDE/KJob1
-rw-r--r--kdecore/includes/KDE/KLocale1
-rw-r--r--kdecore/includes/KDE/KMimeType1
-rw-r--r--kdecore/includes/KDE/KRandom1
-rw-r--r--kdecore/includes/KDE/KSaveFile1
-rw-r--r--kdecore/includes/KDE/KStandardDirs1
-rw-r--r--kdecore/includes/KDE/KSystemTimeZone1
-rw-r--r--kdecore/includes/KDE/KTemporaryFile1
-rw-r--r--kdecore/includes/KDE/KTimeZone1
-rw-r--r--kdecore/includes/KDE/KUrl1
-rw-r--r--kdecore/includes/config-CamelCaseInclude.cmake2
-rw-r--r--kdepimlibs/CMakeLists.txt4
21 files changed, 39 insertions, 19 deletions
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 7be892a..fee2f7a 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -723,3 +723,5 @@ install(FILES
# DESTINATION ${SERVICETYPES_INSTALL_DIR}
# )
+add_subdirectory(includes)
+
diff --git a/kdecore/includes/CMakeLists.txt b/kdecore/includes/CMakeLists.txt
new file mode 100644
index 0000000..3cc6328
--- /dev/null
+++ b/kdecore/includes/CMakeLists.txt
@@ -0,0 +1,33 @@
+
+macro(install_headers _dir)
+ install( DIRECTORY ${_dir} DESTINATION ${INCLUDE_INSTALL_DIR} )
+endmacro()
+
+macro(create_header _file _path _header)
+ #For installation
+ set(CAMELCASE_INCLUDE_PATH "../${_header}")
+ configure_file(config-CamelCaseInclude.cmake ${CMAKE_CURRENT_BINARY_DIR}/KDE/${_file})
+ #For including from the kdepimlibs stuff
+ set(CAMELCASE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../${_path}/${_header}")
+ configure_file(config-CamelCaseInclude.cmake ${CMAKE_CURRENT_BINARY_DIR}/includes/KDE/${_file})
+endmacro()
+
+create_header(KCalendarSystem date kcalendarsystem.h)
+create_header(KConfig config kconfig.h)
+create_header(KCodecs text kcodecs.h)
+create_header(KConfigGroup config kconfiggroup.h)
+create_header(KDateTime date kdatetime.h)
+create_header(KDebug io kdebug.h)
+create_header(KGlobal kernel kglobal.h)
+create_header(KJob jobs kjob.h)
+create_header(KLocale localization klocale.h)
+create_header(KMimeType services kmimetype.h)
+create_header(KRandom util krandom.h)
+create_header(KSaveFile io ksavefile.h)
+create_header(KStandardDirs kernel kstandarddirs.h)
+create_header(KSystemTimeZone date ksystemtimezone.h)
+create_header(KTemporaryFile io ktemporaryfile.h)
+create_header(KTimeZone date ktimezone.h)
+create_header(KUrl io kurl.h)
+
+install_headers(${CMAKE_CURRENT_BINARY_DIR}/KDE)
diff --git a/kdecore/includes/KDE/KCalendarSystem b/kdecore/includes/KDE/KCalendarSystem
deleted file mode 100644
index 2c0be21..0000000
--- a/kdecore/includes/KDE/KCalendarSystem
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../date/kcalendarsystem.h"
diff --git a/kdecore/includes/KDE/KCodecs b/kdecore/includes/KDE/KCodecs
deleted file mode 100644
index 3d50e12..0000000
--- a/kdecore/includes/KDE/KCodecs
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../text/kcodecs.h"
diff --git a/kdecore/includes/KDE/KConfig b/kdecore/includes/KDE/KConfig
deleted file mode 100644
index 6456eea..0000000
--- a/kdecore/includes/KDE/KConfig
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../config/kconfig.h"
diff --git a/kdecore/includes/KDE/KConfigGroup b/kdecore/includes/KDE/KConfigGroup
deleted file mode 100644
index f4cf57c..0000000
--- a/kdecore/includes/KDE/KConfigGroup
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../config/kconfiggroup.h"
diff --git a/kdecore/includes/KDE/KDateTime b/kdecore/includes/KDE/KDateTime
deleted file mode 100644
index 83afae5..0000000
--- a/kdecore/includes/KDE/KDateTime
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../date/kdatetime.h"
diff --git a/kdecore/includes/KDE/KDebug b/kdecore/includes/KDE/KDebug
deleted file mode 100644
index 195d252..0000000
--- a/kdecore/includes/KDE/KDebug
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../io/kdebug.h"
diff --git a/kdecore/includes/KDE/KGlobal b/kdecore/includes/KDE/KGlobal
deleted file mode 100644
index 8c978c9..0000000
--- a/kdecore/includes/KDE/KGlobal
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../kernel/kglobal.h"
diff --git a/kdecore/includes/KDE/KJob b/kdecore/includes/KDE/KJob
deleted file mode 100644
index a2ab634..0000000
--- a/kdecore/includes/KDE/KJob
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../jobs/kjob.h"
diff --git a/kdecore/includes/KDE/KLocale b/kdecore/includes/KDE/KLocale
deleted file mode 100644
index 74e892e..0000000
--- a/kdecore/includes/KDE/KLocale
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../localization/klocale.h"
diff --git a/kdecore/includes/KDE/KMimeType b/kdecore/includes/KDE/KMimeType
deleted file mode 100644
index 928633d..0000000
--- a/kdecore/includes/KDE/KMimeType
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../services/kmimetype.h"
diff --git a/kdecore/includes/KDE/KRandom b/kdecore/includes/KDE/KRandom
deleted file mode 100644
index 63372ac..0000000
--- a/kdecore/includes/KDE/KRandom
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../util/krandom.h"
diff --git a/kdecore/includes/KDE/KSaveFile b/kdecore/includes/KDE/KSaveFile
deleted file mode 100644
index 36321dd..0000000
--- a/kdecore/includes/KDE/KSaveFile
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../io/ksavefile.h"
diff --git a/kdecore/includes/KDE/KStandardDirs b/kdecore/includes/KDE/KStandardDirs
deleted file mode 100644
index 8805ca8..0000000
--- a/kdecore/includes/KDE/KStandardDirs
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../kernel/kstandarddirs.h"
diff --git a/kdecore/includes/KDE/KSystemTimeZone b/kdecore/includes/KDE/KSystemTimeZone
deleted file mode 100644
index b060afd..0000000
--- a/kdecore/includes/KDE/KSystemTimeZone
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../date/ksystemtimezone.h"
diff --git a/kdecore/includes/KDE/KTemporaryFile b/kdecore/includes/KDE/KTemporaryFile
deleted file mode 100644
index 03ac64b..0000000
--- a/kdecore/includes/KDE/KTemporaryFile
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../io/ktemporaryfile.h"
diff --git a/kdecore/includes/KDE/KTimeZone b/kdecore/includes/KDE/KTimeZone
deleted file mode 100644
index 7cb8fb6..0000000
--- a/kdecore/includes/KDE/KTimeZone
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../date/ktimezone.h"
diff --git a/kdecore/includes/KDE/KUrl b/kdecore/includes/KDE/KUrl
deleted file mode 100644
index 83b786b..0000000
--- a/kdecore/includes/KDE/KUrl
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../io/kurl.h"
diff --git a/kdecore/includes/config-CamelCaseInclude.cmake b/kdecore/includes/config-CamelCaseInclude.cmake
new file mode 100644
index 0000000..b6bb3e9
--- /dev/null
+++ b/kdecore/includes/config-CamelCaseInclude.cmake
@@ -0,0 +1,2 @@
+#include "${CAMELCASE_INCLUDE_PATH}"
+
diff --git a/kdepimlibs/CMakeLists.txt b/kdepimlibs/CMakeLists.txt
index eaf251f..6f64de0 100644
--- a/kdepimlibs/CMakeLists.txt
+++ b/kdepimlibs/CMakeLists.txt
@@ -25,8 +25,8 @@ find_package(Qt4 4.6.0 REQUIRED)
include_directories(
${QT_INCLUDES}
kdepimlibs
- ../kdecore/includes
- ../kdecore/includes/KDE
+ ${CMAKE_CURRENT_BINARY_DIR}/../kdecore/includes/includes
+ ${CMAKE_CURRENT_BINARY_DIR}/../kdecore/includes/includes/KDE
${CMAKE_CURRENT_BINARY_DIR}/../kdecore #kdefakes.h
)