summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2012-06-27 23:29:52 (GMT)
committerChristian Mollekopf <chrigi_1@fastmail.fm>2012-06-27 23:29:52 (GMT)
commite3e2c3e4aa02f24ac22c3ded388c27ae7e630ba2 (patch)
tree559ecc892a720e21d5d2a137a5c3058b912bf6dd
parente541be844bbfd101c3a03617af25749603905bd2 (diff)
downloadlibcalendaring-e3e2c3e4aa02f24ac22c3ded388c27ae7e630ba2.tar.gz
generate kdeversion.h compression stuff
-rw-r--r--kdecore/CMakeLists.txt15
-rw-r--r--kdecore/compression/kfilterbase.cpp2
2 files changed, 11 insertions, 6 deletions
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 500c385..166cd87 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -16,7 +16,11 @@ if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND
cmake_policy(SET CMP0017 NEW)
endif()
-
+set (KDE_VERSION_MAJOR 1)
+set (KDE_VERSION_MINOR 1)
+set (KDE_VERSION_RELEASE 1)
+set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
+set (KDE_VERSION_STRING "${KDE_VERSION} (1.1.1)")
find_package(Qt4 4.6.0 REQUIRED)
@@ -42,7 +46,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/jobs)
# configure_file(kdefakes.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdefakes.h )
# Generate kdeversion.h
-# configure_file(util/kdeversion.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdeversion.h )
+configure_file(util/kdeversion.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdeversion.h )
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
# Configure checks for kdirwatch
# macro_optional_find_package(FAM)
@@ -222,9 +227,9 @@ add_definitions(-DQT_NO_CAST_FROM_ASCII)
########### next target ###############
set(kdecore_LIB_SRCS
-# compression/kgzipfilter.cpp
-# compression/kfilterbase.cpp
-# compression/kfilterdev.cpp
+ compression/kgzipfilter.cpp
+ compression/kfilterbase.cpp
+ compression/kfilterdev.cpp
config/kconfig.cpp
config/kconfigbase.cpp
config/kconfiggroup.cpp
diff --git a/kdecore/compression/kfilterbase.cpp b/kdecore/compression/kfilterbase.cpp
index 0e3a536..861fd25 100644
--- a/kdecore/compression/kfilterbase.cpp
+++ b/kdecore/compression/kfilterbase.cpp
@@ -18,7 +18,7 @@
*/
#include "kfilterbase.h"
-#include <config-compression.h>
+// #include <config-compression.h>
#include <QDebug>
#include <QtCore/QIODevice>