Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: set CMAKE_REQUIRED_DEFINITIONS to QT_DEFINITIONS

Browse source 
also removing _KDE4_PLATFORM_INCLUDE_DIRS and _KDE4_PLATFORM_DEFINITIONS,
bit by bit things from KDE4Internal module are being moved to where they
should be

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-17 05:49:01 +03:00
parent 08660485c4
commit fd808fe0e8
2 changed files with 9 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ConfigureChecks.cmake
View file

@ -11,9 +11,9 @@ include(CheckStructHasMember)
include(CheckCXXSourceCompiles)
include(CMakePushCheckState)
# The FindKDE4.cmake module sets _KDE4_PLATFORM_DEFINITIONS with
# definitions like _GNU_SOURCE that are needed on each platform.
set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS})
# KatieConfig.cmake sets QT_DEFINITIONS with definitions like _GNU_SOURCE that
# are needed on each platform.
set(CMAKE_REQUIRED_DEFINITIONS ${QT_DEFINITIONS})
kde4_bool_to_01(LibArchive_FOUND HAVE_LIBARCHIVE) # karchive
kde4_bool_to_01(BZIP2_FOUND HAVE_BZIP2) # karchive

33
cmake/modules/FindKDE4Internal.cmake
View file

@ -83,9 +83,6 @@
# have such a dependency. This variable is deprecated with KDE 4.2.0, but
# will still work to make the module backwards-compatible.
# _KDE4_PLATFORM_INCLUDE_DIRS is used only internally
# _KDE4_PLATFORM_DEFINITIONS is used only internally
# Copyright (c) 2006-2009, Alexander Neundorf <neundorf@kde.org>
# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
#
@ -124,17 +121,7 @@ if(KDE4_FIND_REQUIRED OR KDE4Internal_FIND_REQUIRED)
endif()
find_package(Katie ${_REQ_STRING_KDE4} 4.13.0)
# Check that we really found everything.
# If KDE4 was searched with REQUIRED, we error out with FATAL_ERROR if something
# wasn't found already above in the other FIND_PACKAGE() calls. If KDE4 was
# searched without REQUIRED and something in the FIND_PACKAGE() calls above
# wasn't found,then we get here and must check that everything has actually
# been found. If something is missing, we must not fail with FATAL_ERROR, but only not set KDE4_FOUND.
if(NOT Katie_FOUND)
message(STATUS "KDE4 not found, because Katie was not found")
return()
endif()
find_package(X11 REQUIRED)
# Used in configure_file() and install(EXPORT)
set(KDE4_TARGET_PREFIX KDE4::)
@ -291,17 +278,6 @@ if(WIN32 OR CYGWIN OR APPLE)
message(FATAL_ERROR "Windows/Cygwin/Apple is NOT supported.")
endif()
set(_KDE4_PLATFORM_INCLUDE_DIRS)
set(_KDE4_PLATFORM_DEFINITIONS)
find_package(X11 REQUIRED)
# UNIX has already set _KDE4_PLATFORM_INCLUDE_DIRS, so append
set(_KDE4_PLATFORM_INCLUDE_DIRS ${_KDE4_PLATFORM_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
set(_KDE4_PLATFORM_DEFINITIONS "${_KDE4_PLATFORM_DEFINITIONS} -DNDEBUG")
endif()
############################################################
# compiler specific settings
############################################################
@ -371,15 +347,18 @@ set(KDE4_INCLUDES
${KDE4_INCLUDE_DIR}
${KDE4_INCLUDE_DIR}/KDE
${QT_INCLUDES}
${_KDE4_PLATFORM_INCLUDE_DIRS}
${X11_INCLUDE_DIR}
)
set(KDE4_DEFINITIONS
${_KDE4_PLATFORM_DEFINITIONS}
-DQT_NO_CAST_TO_ASCII
-DQT_DEPRECATED_WARNINGS
)
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
set(KDE4_DEFINITIONS "${KDE4_DEFINITIONS} -DNDEBUG")
endif()
if(NOT _kde4_uninstall_rule_created)
set(_kde4_uninstall_rule_created TRUE)
configure_file(