From kde-commits Sun Feb 23 20:58:51 2014 From: Harald Fernengel Date: Sun, 23 Feb 2014 20:58:51 +0000 To: kde-commits Subject: [kinit] /: Restore ability to set an application icon Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=139318914129383 Git commit 270b001b0f74471107bf9ef43c873d0deccdf1a6 by Harald Fernengel. Committed on 23/02/2014 at 20:56. Pushed by harald into branch 'master'. Restore ability to set an application icon Seems that that *.icns glob wasn't working at all. Simply set the MACOSX_BUNDLE_ICON_FILE as _resource M +5 -8 KF5InitMacros.cmake http://commits.kde.org/kinit/270b001b0f74471107bf9ef43c873d0deccdf1a6 diff --git a/KF5InitMacros.cmake b/KF5InitMacros.cmake index e8212bb..dddc230 100644 --- a/KF5InitMacros.cmake +++ b/KF5InitMacros.cmake @@ -38,18 +38,15 @@ function (KF5_ADD_KDEINIT_EXECUTABLE _target_NAME ) add_library(kdeinit_${_target_NAME} STATIC ${CMAKE_CURRENT_BINARY_= DIR}/${_target_NAME}_win32lib_dummy.cpp) = add_executable(${_target_NAME} ${_SRCS} ${CMAKE_CURRENT_BINARY_DIR= }/${_target_NAME}_dummy.cpp ${_resourcefile}) - else(WIN32) + else() = add_library(kdeinit_${_target_NAME} SHARED ${_SRCS}) = - if (Q_WS_MAC) - list(FIND _SRCS *.icns _icon_position) - if(NOT _res_position EQUAL -1) - list(GET _SRCS ${_icon_position} _resourcefile) - endif(NOT _res_position EQUAL -1) - endif (Q_WS_MAC) + if (APPLE) + set(_resourcefile ${MACOSX_BUNDLE_ICON_FILE}) + endif() add_executable(${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_targ= et_NAME}_dummy.cpp ${_resourcefile}) - endif(WIN32) + endif() = target_link_libraries(${_target_NAME} kdeinit_${_target_NAME}) set_target_properties(kdeinit_${_target_NAME} PROPERTIES OUTPUT_NAME k= deinit5_${_target_NAME})