Commit 690485d2 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Re-enable building karchive

I had forgotten that the stable builds use the same dependency build
from master as the nightlies.
parent c5b490fe
......@@ -2,6 +2,7 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
#
# All needed frameworks:
#
# Archive
# Config
# WidgetsAddons
# Completion
......@@ -30,6 +31,23 @@ ExternalProject_Add(
)
ExternalProject_Add(
ext_karchive
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/karchive-5.44.0.zip
URL_MD5 c60a8e22b88cc7328610041638459689
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/karchive.diff
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
DEPENDS ext_extra_cmake_modules
)
ExternalProject_Add(
ext_kconfig
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
......@@ -43,7 +61,7 @@ ExternalProject_Add(
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
UPDATE_COMMAND ""
DEPENDS ext_extra_cmake_modules
DEPENDS ext_karchive
)
......
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2441977..2a20a13 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,20 +29,20 @@ set_package_properties(ZLIB PROPERTIES
PURPOSE "Required by the core KDE libraries and some critical kioslaves"
)
-find_package(BZip2)
-set_package_properties(BZip2 PROPERTIES
- URL "http://www.bzip.org"
- DESCRIPTION "Support for BZip2 compressed files and data streams"
- TYPE RECOMMENDED
- PURPOSE "Support for BZip2 compressed files and data streams"
-)
-
-find_package(LibLZMA)
-set_package_properties(LibLZMA PROPERTIES
- URL "http://tukaani.org/xz/"
- DESCRIPTION "Support for xz compressed files and data streams"
- PURPOSE "Support for xz compressed files and data streams"
-)
+#find_package(BZip2)
+#set_package_properties(BZip2 PROPERTIES
+# URL "http://www.bzip.org"
+# DESCRIPTION "Support for BZip2 compressed files and data streams"
+# TYPE RECOMMENDED
+# PURPOSE "Support for BZip2 compressed files and data streams"
+#)
+
+#find_package(LibLZMA)
+#set_package_properties(LibLZMA PROPERTIES
+# URL "http://tukaani.org/xz/"
+# DESCRIPTION "Support for xz compressed files and data streams"
+# PURPOSE "Support for xz compressed files and data streams"
+#)
include_directories(
${ZLIB_INCLUDE_DIR}
)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment