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

cmake cleanup and fixup

Browse source
This commit is contained in:
Ivailo Monev 2014-11-21 01:38:25 +00:00
parent e81eac154e
commit 086923943f
4 changed files with 3 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cmake/modules/FindIOKit.cmake
View file

@ -1,23 +0,0 @@
# - Find IOKit on Mac
#
# IOKIT_LIBRARY - the library to use IOKit
# IOKIT_FOUND - true if IOKit has been found
# Copyright (c) 2009, Harald Fernengel <harry@kdevelop.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
include(CMakeFindFrameworks)
cmake_find_frameworks(IOKit)
cmake_find_frameworks(CoreFoundation)
if (IOKit_FRAMEWORKS)
set(IOKIT_LIBRARY "-framework IOKit -framework CoreFoundation" CACHE FILEPATH "IOKit framework" FORCE)
set(IOKIT_FOUND 1)
endif (IOKit_FRAMEWORKS)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(IOKit DEFAULT_MSG IOKIT_LIBRARY)

4
cmake/modules/FindKDE4Internal.cmake
View file

@ -502,7 +502,6 @@ if (_kdeBootStrapping)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler${CMAKE_EXECUTABLE_SUFFIX}.shell ) set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler${CMAKE_EXECUTABLE_SUFFIX}.shell )
set(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kauth-policy-gen${CMAKE_EXECUTABLE_SUFFIX}.shell )
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4${CMAKE_EXECUTABLE_SUFFIX}.shell ) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4${CMAKE_EXECUTABLE_SUFFIX}.shell )
set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets${CMAKE_EXECUTABLE_SUFFIX}.shell ) set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets${CMAKE_EXECUTABLE_SUFFIX}.shell )
@ -511,7 +510,6 @@ if (_kdeBootStrapping)
# when building kdelibs, make the kcfg rules depend on the binaries... # when building kdelibs, make the kcfg rules depend on the binaries...
set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler) set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
set( _KDE4_KAUTH_POLICY_GEN_EXECUTABLE_DEP kauth-policy-gen)
set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets) set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4) set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
@ -523,7 +521,6 @@ else (_kdeBootStrapping)
set( _KDE4_KCONFIG_COMPILER_DEP) set( _KDE4_KCONFIG_COMPILER_DEP)
set( _KDE4_MAKEKDEWIDGETS_DEP) set( _KDE4_MAKEKDEWIDGETS_DEP)
set( _KDE4_MEINPROC_EXECUTABLE_DEP) set( _KDE4_MEINPROC_EXECUTABLE_DEP)
set( _KDE4_KAUTH_POLICY_GEN_EXECUTABLE_DEP)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
@ -572,7 +569,6 @@ else (_kdeBootStrapping)
set(KDE4_KCFGC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/kconfig_compiler ) set(KDE4_KCFGC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
set(KDE4_MEINPROC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/meinproc4 ) set(KDE4_MEINPROC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/meinproc4 )
endif(NOT WINCE) endif(NOT WINCE)
get_target_property(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${KDE4_TARGET_PREFIX}kauth-policy-gen LOCATION_${_firstConfig})
get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${_firstConfig}) get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${_firstConfig})
# allow searching cmake modules in all given kde install locations (KDEDIRS based) # allow searching cmake modules in all given kde install locations (KDEDIRS based)

19
cmake/modules/KDE4Macros.cmake
View file

@ -1337,24 +1337,7 @@ endfunction(KDE4_INSTALL_AUTH_HELPER_FILES)
# and on Mac (Authorization Services) will be added to the system action registry using the native MacOS API during # and on Mac (Authorization Services) will be added to the system action registry using the native MacOS API during
# the install phase # the install phase
function(KDE4_INSTALL_AUTH_ACTIONS HELPER_ID ACTIONS_FILE) function(KDE4_INSTALL_AUTH_ACTIONS HELPER_ID ACTIONS_FILE)
message(AUTHOR_WARNING "PolicyKit/Polikt actions are not required")
if(KDE4_AUTH_BACKEND_NAME STREQUAL "APPLE" OR KDE4_AUTH_BACKEND_NAME STREQUAL "OSX")
install(CODE "execute_process(COMMAND ${KDE4_KAUTH_POLICY_GEN_EXECUTABLE} ${ACTIONS_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})")
elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT" OR KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
set(_output ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.policy)
get_filename_component(_input ${ACTIONS_FILE} ABSOLUTE)
add_custom_command(OUTPUT ${_output}
COMMAND ${KDE4_KAUTH_POLICY_GEN_EXECUTABLE} ${_input} > ${_output}
MAIN_DEPENDENCY ${_input}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Generating ${HELPER_ID}.policy"
DEPENDS ${_KDE4_KAUTH_POLICY_GEN_EXECUTABLE_DEP})
add_custom_target("actions for ${HELPER_ID}" ALL DEPENDS ${_output})
install(FILES ${_output} DESTINATION ${KDE4_AUTH_POLICY_FILES_INSTALL_DIR})
endif()
endfunction(KDE4_INSTALL_AUTH_ACTIONS) endfunction(KDE4_INSTALL_AUTH_ACTIONS)

2
kdecore/auth/ConfigureChecks.cmake
View file

@ -7,6 +7,8 @@ set(KAUTH_BACKEND "DBus" CACHE STRING "Specifies the KAuth helper backend to bui
# Add the correct libraries/files depending on the backend # Add the correct libraries/files depending on the backend
if (KAUTH_BACKEND STREQUAL "DBus") if (KAUTH_BACKEND STREQUAL "DBus")
set(KAUTH_COMPILING_DBUS_HELPER_BACKEND TRUE) set(KAUTH_COMPILING_DBUS_HELPER_BACKEND TRUE)
set(KDE4_AUTH_HELPER_BACKEND_NAME "DBUS")
set(KDE4_AUTH_BACKEND_NAME "DBUS")
set(KAUTH_BACKEND_SRCS set(KAUTH_BACKEND_SRCS
auth/backends/dbus/DBusBackend.cpp auth/backends/dbus/DBusBackend.cpp
auth/backends/dbus/DBusBackend.h auth/backends/dbus/DBusBackend.h