summaryrefslogtreecommitdiffstats
path: root/source/kde/cmake/calligra
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde/cmake/calligra')
-rw-r--r--source/kde/cmake/calligra12
1 files changed, 8 insertions, 4 deletions
diff --git a/source/kde/cmake/calligra b/source/kde/cmake/calligra
index f38c6c786..636fda00f 100644
--- a/source/kde/cmake/calligra
+++ b/source/kde/cmake/calligra
@@ -1,12 +1,16 @@
+# NOTE: Added -DU_USING_ICU_NAMESPACE=1 to CXXFLAGS, which should be a temporary
+# requirement. See the link below:
+# http://site.icu-project.org/download/61#TOC-Migration-Issues
+
mkdir build
cd build
cmake \
$KDE_OPT_ARGS \
-DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" \
-DCMAKE_INCLUDE_PATH:STRING="/usr/include/openmj2-2.1" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \