summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-06-27 17:04:58 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-06-27 17:04:58 (GMT)
commit676c030bc92a403608f2f7a683ce0eb0cef90096 (patch)
treec52f5e5a90e1d810a475c06cddbe78f8247f418a
parent53262e9d6abb856bcc0a86e2adf3e6ea33afd627 (diff)
parent16dbf0d9d0f6117b3d0cc030409606e2ec758eb0 (diff)
downloadlibcalendaring-676c030bc92a403608f2f7a683ce0eb0cef90096.tar.gz
Merge branch 'master' into 860
-rw-r--r--.gitignore3
-rw-r--r--kcalcore/CMakeLists.txt2
-rw-r--r--kdecore/CMakeLists.txt4
-rw-r--r--kdecore/kernel/kglobal.cpp6
-rw-r--r--kimap/CMakeLists.txt2
-rw-r--r--kmime/CMakeLists.txt2
6 files changed, 11 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5a536f6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*~
+*/build/*
+build/*
diff --git a/kcalcore/CMakeLists.txt b/kcalcore/CMakeLists.txt
index 8bce4cd..62bcded 100644
--- a/kcalcore/CMakeLists.txt
+++ b/kcalcore/CMakeLists.txt
@@ -21,7 +21,7 @@ find_package(Qt4 4.6.0 REQUIRED)
include_directories(${QT_INCLUDES})
-include(GenerateExportHeader)
+# include(GenerateExportHeader)
############### Build Options ###############
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 45205ac..af6b408 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -20,7 +20,7 @@ endif()
find_package(Qt4 4.6.0 REQUIRED)
-include_directories(${QT_INCLUDES})
+include_directories(${QT_INCLUDES} ./)
INCLUDE (CheckTypeSize)
INCLUDE (CheckStructMember)
@@ -279,7 +279,7 @@ set(kdecore_LIB_SRCS
# kernel/kauthorized.cpp
# kernel/kaboutdata.cpp
# kernel/kcmdlineargs.cpp
-# kernel/kglobal.cpp
+ kernel/kglobal.cpp
# kernel/kcomponentdata.cpp
# kernel/kstandarddirs.cpp
# kernel/ktoolinvocation.cpp
diff --git a/kdecore/kernel/kglobal.cpp b/kdecore/kernel/kglobal.cpp
index 766cc0b..ff5ba6e 100644
--- a/kdecore/kernel/kglobal.cpp
+++ b/kdecore/kernel/kglobal.cpp
@@ -30,11 +30,11 @@
#include "kglobal_p.h"
#include <QThread>
-#include <config.h>
+// #include <config.h>
-#ifdef HAVE_SYS_STAT_H
+// #ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
-#endif
+// #endif
#include <QtCore/QList>
#include <QtCore/QSet>
diff --git a/kimap/CMakeLists.txt b/kimap/CMakeLists.txt
index e05b1cc..f94baa3 100644
--- a/kimap/CMakeLists.txt
+++ b/kimap/CMakeLists.txt
@@ -38,7 +38,7 @@ find_package(Qt4 4.6.0 REQUIRED)
include_directories(${QT_INCLUDES})
-include(GenerateExportHeader)
+# include(GenerateExportHeader)
include_directories( ../kdecore ../ ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/kmime/CMakeLists.txt b/kmime/CMakeLists.txt
index 2b3b144..299c593 100644
--- a/kmime/CMakeLists.txt
+++ b/kmime/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt4 4.6.0 REQUIRED)
include_directories(${QT_INCLUDES})
-include(GenerateExportHeader)
+# include(GenerateExportHeader)
include_directories( ../kdecore )