forked from mirrors/nixpkgs
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
From: Andre Woebbeking <Woebbeking@kde.org>
|
||
|
|
Date: Sun, 13 Jan 2013 15:10:38 +0000
|
||
|
|
Subject: compile with kdelibs 4.10 (tests are enabled by default)
|
||
|
|
X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=39fdda6757cbbb35480dec98eac419eb1879cb31
|
||
|
|
---
|
||
|
|
compile with kdelibs 4.10 (tests are enabled by default)
|
||
|
|
---
|
||
|
|
|
||
|
|
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -96,11 +96,6 @@
|
||
|
|
set(SHOULD_BUILD_ACTIVE FALSE)
|
||
|
|
ENDIF()
|
||
|
|
|
||
|
|
-if(KDE4_BUILD_TESTS)
|
||
|
|
- # only with this definition will the FOO_TEST_EXPORT macro do something
|
||
|
|
- add_definitions(-DCOMPILING_TESTS)
|
||
|
|
-endif(KDE4_BUILD_TESTS)
|
||
|
|
-
|
||
|
|
########################
|
||
|
|
#########################
|
||
|
|
## Look for KDE and Qt ##
|
||
|
|
@@ -146,6 +141,11 @@
|
||
|
|
endif(NOT ${KDE_VERSION} VERSION_GREATER 4.6.4)
|
||
|
|
|
||
|
|
macro_ensure_out_of_source_build("Compiling Calligra inside the source directory is not possible. Please refer to the build instruction http://community.kde.org/Calligra/Building/Building_Calligra")
|
||
|
|
+
|
||
|
|
+if(KDE4_BUILD_TESTS)
|
||
|
|
+ # only with this definition will the FOO_TEST_EXPORT macro do something
|
||
|
|
+ add_definitions(-DCOMPILING_TESTS)
|
||
|
|
+endif(KDE4_BUILD_TESTS)
|
||
|
|
|
||
|
|
###########################
|
||
|
|
############################
|
||
|
|
|