Ticket #44655: patch-cmake-modules-KDE4Macros.cmake.diff.diff

File patch-cmake-modules-KDE4Macros.cmake.diff.diff, 1.4 KB (added by RJVB (René Bertin), 10 years ago)

NB diff for port dir kdelibs4/files/patch-cmake-modules-KDE4Macros.cmake.diff !

  • patch-cmake-modules-KDE4Macros.cmake.diff

    old new  
    1 --- kdelibs-4.12.5/cmake/modules/KDE4Macros.cmake.orig  2014-04-28 13:37:51.000000000 +0900
    2 +++ kdelibs-4.12.5/cmake/modules/KDE4Macros.cmake       2014-05-16 21:32:41.000000000 +0900
     1--- kdelibs-4.12.5/cmake/modules/orig.KDE4Macros.cmake  2014-04-28 06:37:51.000000000 +0200
     2+++ kdelibs-4.12.5/cmake/modules/KDE4Macros.cmake       2014-08-12 13:14:53.000000000 +0200
    33@@ -829,9 +829,9 @@
    44 
    55       if (Q_WS_MAC)
    … …  
    1212       endif (Q_WS_MAC)
    1313       kde4_add_executable(${_target_NAME} "${_nogui}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${_resourcefile})
    1414       target_link_libraries(${_target_NAME} kdeinit_${_target_NAME})
     15@@ -1338,7 +1338,7 @@
     16 # the install phase
     17 function(KDE4_INSTALL_AUTH_ACTIONS HELPER_ID ACTIONS_FILE)
     18 
     19-  if(KDE4_AUTH_BACKEND_NAME STREQUAL "APPLE")
     20+  if(KDE4_AUTH_BACKEND_NAME STREQUAL "APPLE" OR KDE4_AUTH_BACKEND_NAME STREQUAL "OSX")
     21     install(CODE "execute_process(COMMAND ${KDE4_KAUTH_POLICY_GEN_EXECUTABLE} ${ACTIONS_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})")
     22   elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT" OR KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
     23     set(_output ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.policy)