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: move configuration files creation after package lookups

Browse source 
remove unused HAVE_LIBACL definition while at it

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-02-19 17:12:33 +00:00
parent 21697dadf6
commit 578db06441
3 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
CMakeLists.txt
View file

@ -27,6 +27,8 @@ set(KDE_DEFAULT_HOME ".katana" CACHE STRING "The default home directory" )
set(KDE_NO_DEPRECATED TRUE CACHE BOOL "Whether deprecated functionality is desired") set(KDE_NO_DEPRECATED TRUE CACHE BOOL "Whether deprecated functionality is desired")
set(LIBRARY_TYPE SHARED)
################# now find all used packages ################# ################# now find all used packages #################
find_package(KDE4Internal REQUIRED) find_package(KDE4Internal REQUIRED)
@ -132,6 +134,26 @@ set_package_properties(MPV PROPERTIES
PURPOSE "Media preview, sound notifications, etc." PURPOSE "Media preview, sound notifications, etc."
) )
macro_optional_find_package(ACL)
set_package_properties(ACL
PROPERTIES
DESCRIPTION "Support for manipulating access control lists"
URL "ftp://oss.sgi.com/projects/xfs/cmd_tars"
TYPE RECOMMENDED
PURPOSE "KIO and KIO slaves"
)
################# configure checks and create the configured files #################
include(ConfigureChecks.cmake)
# now create config headers
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
configure_file(config-acl.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-acl.h)
configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h)
configure_file(config-pty.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-pty.h)
configure_file(kdemacros.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h)
################# Disallow in-source build ################# ################# Disallow in-source build #################
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
@ -230,30 +252,6 @@ set(KDE4_KPARTS_INCLUDES
${KDE4_KIO_INCLUDES} ${KDE4_KIO_INCLUDES}
) )
################# configure checks and create the configured files #################
set(LIBRARY_TYPE SHARED)
macro_optional_find_package(ACL)
set_package_properties(ACL
PROPERTIES
DESCRIPTION "Support for manipulating access control lists"
URL "ftp://oss.sgi.com/projects/xfs/cmd_tars"
TYPE RECOMMENDED
PURPOSE "KIO and KIO slaves"
)
macro_bool_to_01(ACL_FOUND HAVE_LIBACL HAVE_POSIX_ACL)
configure_file(config-acl.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-acl.h)
include(ConfigureChecks.cmake)
# now create config headers
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h)
configure_file(config-pty.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-pty.h)
configure_file(kdemacros.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h)
################# list the subdirectories ################# ################# list the subdirectories #################
add_subdirectory( cmake ) add_subdirectory( cmake )

2
ConfigureChecks.cmake
View file

@ -18,7 +18,9 @@ include(CheckPrototypeDefinition)
# definitions like _GNU_SOURCE that are needed on each platform. # definitions like _GNU_SOURCE that are needed on each platform.
set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS}) set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS})
macro_bool_to_01(LIBINTL_FOUND ENABLE_NLS) # kdecore macro_bool_to_01(LIBINTL_FOUND ENABLE_NLS) # kdecore
macro_bool_to_01(ACL_FOUND HAVE_POSIX_ACL) # kio
check_include_files(stdio.h HAVE_STDIO_H) # various check_include_files(stdio.h HAVE_STDIO_H) # various
check_include_files(stdlib.h HAVE_STDLIB_H) # various check_include_files(stdlib.h HAVE_STDLIB_H) # various

2
config-acl.h.cmake
View file

@ -1,5 +1,3 @@
#cmakedefine HAVE_LIBACL 1
/* Defined if system has POSIX ACL support. */ /* Defined if system has POSIX ACL support. */
#cmakedefine HAVE_POSIX_ACL 1 #cmakedefine HAVE_POSIX_ACL 1