Commit 250bd93e authored by Volker Krause's avatar Volker Krause
Browse files

Switch to KDECompilerSettings from 5.85

parent cec35718
...@@ -10,14 +10,11 @@ set (RELEASE_SERVICE_VERSION_MICRO "70") ...@@ -10,14 +10,11 @@ set (RELEASE_SERVICE_VERSION_MICRO "70")
set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
project(itinerary VERSION ${RELEASE_SERVICE_VERSION}) project(itinerary VERSION ${RELEASE_SERVICE_VERSION})
set(KF5_MIN_VERSION 5.84) set(KF5_MIN_VERSION 5.85)
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake)
if (POLICY CMP0071)
cmake_policy(SET CMP0071 NEW)
endif()
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECompilerSettings NO_POLICY_SCOPE)
include(ECMAddTests) include(ECMAddTests)
include(ECMGenerateHeaders) include(ECMGenerateHeaders)
include(ECMInstallIcons) include(ECMInstallIcons)
...@@ -96,25 +93,16 @@ if (TARGET KHealthCertificate) ...@@ -96,25 +93,16 @@ if (TARGET KHealthCertificate)
set(HAVE_KHEALTHCERTIFICATE TRUE) set(HAVE_KHEALTHCERTIFICATE TRUE)
endif() endif()
add_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_URL_CAST_FROM_STRING)
add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
add_definitions(-DQT_USE_QSTRINGBUILDER)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
if (ANDROID)
set(CMAKE_MODULE_EXE_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined ${CMAKE_EXE_LINKER_FLAGS}")
endif()
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(autotests) add_subdirectory(autotests)
add_subdirectory(tests) add_subdirectory(tests)
if (NOT ANDROID) ecm_qt_install_logging_categories(
ecm_qt_install_logging_categories( EXPORT ITINERARY
EXPORT ITINERARY FILE org_kde_itinerary.categories
FILE org_kde_itinerary.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} )
)
endif()
ki18n_install(po) ki18n_install(po)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
Supports Markdown
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