Commit c455bd47 authored by Gilles Caulier's avatar Gilles Caulier 🗼

KCalCore have been moved to KF5 framework since many months now. Adjust...

KCalCore have been moved to KF5 framework since many months now. Adjust compilation rule with last KF5.70
parent ccb06b19
......@@ -153,7 +153,6 @@ add_subdirectory(ext_qtav)
add_subdirectory(ext_kf5_frameworks)
add_subdirectory(ext_marble)
add_subdirectory(ext_libksane)
add_subdirectory(ext_kcalcore)
add_subdirectory(ext_ffmpeg)
add_subdirectory(ext_drmingw)
add_subdirectory(ext_imagemagick)
......
# Script to build kcalcore for digiKam bundle.
#
# Copyright (c) 2015-2020 by Gilles Caulier <caulier dot gilles at gmail dot com>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
set(EXTPREFIX_kcalcore "${EXTPREFIX}" )
set(KA_VERSION 20.04.0)
GetKF5ApplicationMd5Sums(kcalcore ${KA_VERSION})
if(MINGW)
ExternalProject_Add(
ext_kcalcore
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/release-service/${KA_VERSION}/src/kcalcore-${KA_VERSION}.tar.xz
URL_MD5 ${KF5_APPLICATION_MD5SUM}
INSTALL_DIR ${EXTPREFIX_kcalcore}
CONFIGURE_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.mxe <SOURCE_DIR>/. &&
<SOURCE_DIR>/bootstrap.mxe ${MXE_BUILDROOT} RelWithDebInfo -DBUILD_TESTING=OFF
BUILD_COMMAND cd <SOURCE_DIR>/build.mxe && $(MAKE)
INSTALL_COMMAND cd <SOURCE_DIR>/build.mxe && make install/fast
BUILD_IN_SOURCE 1
UPDATE_COMMAND ""
ALWAYS 0
)
elseif(APPLE)
ExternalProject_Add(
ext_kcalcore
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/release-service/${KA_VERSION}/src/kcalcore-${KA_VERSION}.tar.xz
URL_MD5 ${KF5_APPLICATION_MD5SUM}
INSTALL_DIR ${EXTPREFIX_kcalcore}
CONFIGURE_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
<SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_kcalcore} RelWithDebInfo x86_64 "${BASH_OPTIONS}"
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
INSTALL_COMMAND cd <SOURCE_DIR>/build && make install/fast
BUILD_IN_SOURCE 1
UPDATE_COMMAND ""
ALWAYS 0
)
else() # Linux
ExternalProject_Add(
ext_kcalcore
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/release-service/${KA_VERSION}/src/kcalcore-${KA_VERSION}.tar.xz
URL_MD5 ${KF5_APPLICATION_MD5SUM}
INSTALL_DIR ${EXTPREFIX_kcalcore}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_kcalcore}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=OFF
-Wno-dev
UPDATE_COMMAND ""
ALWAYS 0
)
endif()
......@@ -198,11 +198,11 @@ function(InstallKF5Component
endfunction()
if(MINGW)
set(KF5_VERSION 5.70) # we have Qt 5.12.1 available.
set(KF5_VERSION 5.70) # we have Qt 5.14.2 available.
elseif(APPLE)
set(KF5_VERSION 5.70) # we have Qt 5.14.0 available.
set(KF5_VERSION 5.70) # we have Qt 5.14.1 available.
else()
set(KF5_VERSION 5.70) # we have Qt 5.11.3 available.
set(KF5_VERSION 5.70) # we have Qt 5.14.2 available.
endif()
if(APPLE)
......@@ -231,6 +231,7 @@ InstallKF5Component(kconfigwidgets ${KF5_VERSION} ""
InstallKF5Component(kiconthemes ${KF5_VERSION} "" "")
InstallKF5Component(kservice ${KF5_VERSION} "" "")
InstallKF5Component(kglobalaccel ${KF5_VERSION} "" "")
InstallKF5Component(kcalendarcore ${KF5_VERSION} "" "")
InstallKF5Component(kxmlgui ${KF5_VERSION} "" "")
InstallKF5Component(kbookmarks ${KF5_VERSION} "" "")
InstallKF5Component(kimageformats ${KF5_VERSION} "" "")
......
......@@ -93,7 +93,7 @@ cmake --build . --config RelWithDebInfo --target ext_knotifications -- -j$C
cmake --build . --config RelWithDebInfo --target ext_marble -- -j$CPU_CORES
# Calendar support
cmake --build . --config RelWithDebInfo --target ext_kcalcore -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_kcalendarcore -- -j$CPU_CORES
#################################################################################################
......
......@@ -104,7 +104,7 @@ cmake --build . --config RelWithDebInfo --target ext_kimageformats -- -j$C
cmake --build . --config RelWithDebInfo --target ext_marble -- -j$CPU_CORES
# Calendar support
cmake --build . --config RelWithDebInfo --target ext_kcalcore -- -j$CPU_CORES
cmake --build . --config RelWithDebInfo --target ext_kcalendarcore -- -j$CPU_CORES
# Marble install shared lib at wrong place.
mv $INSTALL_PREFIX/Marble.app/Contents/MacOS/lib/libastro* $INSTALL_PREFIX/lib
......
......@@ -103,7 +103,7 @@ ${MXE_BUILD_TARGETS}-cmake --build . --config RelWithDebInfo --target ext_kimage
${MXE_BUILD_TARGETS}-cmake --build . --config RelWithDebInfo --target ext_marble -- -j$CPU_CORES
# Calendar support
${MXE_BUILD_TARGETS}-cmake --build . --config RelWithDebInfo --target ext_kcalcore -- -j$CPU_CORES
${MXE_BUILD_TARGETS}-cmake --build . --config RelWithDebInfo --target ext_kcalendarcore -- -j$CPU_CORES
# Marble install shared lib at wrong place.
mv $MXE_INSTALL_PREFIX/libastro* $MXE_INSTALL_PREFIX/bin
......
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