diff --git a/CMakeLists.txt b/CMakeLists.txt index 0211f006..e552986b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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(LIBRARY_TYPE SHARED) + ################# now find all used packages ################# find_package(KDE4Internal REQUIRED) @@ -132,6 +134,26 @@ set_package_properties(MPV PROPERTIES 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 ################# if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") @@ -230,30 +252,6 @@ set(KDE4_KPARTS_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 ################# add_subdirectory( cmake ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 7c83fa8e..194ed362 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -18,7 +18,9 @@ include(CheckPrototypeDefinition) # definitions like _GNU_SOURCE that are needed on each platform. set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS}) + 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(stdlib.h HAVE_STDLIB_H) # various diff --git a/config-acl.h.cmake b/config-acl.h.cmake index 0ab340ae..605e1d6f 100644 --- a/config-acl.h.cmake +++ b/config-acl.h.cmake @@ -1,5 +1,3 @@ -#cmakedefine HAVE_LIBACL 1 - /* Defined if system has POSIX ACL support. */ #cmakedefine HAVE_POSIX_ACL 1