aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2015-12-18 12:37:19 +0100
committerKevin Funk <kfunk@kde.org>2015-12-18 15:57:50 +0100
commit942ba80dae253fef93094d178da3ce0abc47da5d (patch)
treec1e633d8caa14d02536806c91a7cf30f3680c809 /modules
parentbdd38b5f45a889043deb0665bdb66086ca6c9bf5 (diff)
downloadextra-cmake-modules-942ba80dae253fef93094d178da3ce0abc47da5d.tar.gz
extra-cmake-modules-942ba80dae253fef93094d178da3ce0abc47da5d.tar.bz2
CMake: Cleanup: Strip text from endif/else
REVIEW: 126414
Diffstat (limited to 'modules')
-rw-r--r--modules/ECMAddAppIcon.cmake4
-rw-r--r--modules/ECMInstallIcons.cmake12
2 files changed, 8 insertions, 8 deletions
diff --git a/modules/ECMAddAppIcon.cmake b/modules/ECMAddAppIcon.cmake
index f90d4c33..5233a5f1 100644
--- a/modules/ECMAddAppIcon.cmake
+++ b/modules/ECMAddAppIcon.cmake
@@ -222,8 +222,8 @@ function(ecm_add_app_icon appsources)
# Install the icon into the Resources dir in the bundle
set_source_files_properties(${_outfilename}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
- else(ICONUTIL_EXECUTABLE)
+ else()
message(STATUS "Unable to find the iconutil utility - application will not have an application icon!")
- endif(ICONUTIL_EXECUTABLE)
+ endif()
endif()
endfunction()
diff --git a/modules/ECMInstallIcons.cmake b/modules/ECMInstallIcons.cmake
index 156b16d5..3923636a 100644
--- a/modules/ECMInstallIcons.cmake
+++ b/modules/ECMInstallIcons.cmake
@@ -107,9 +107,9 @@ macro(_ecm_install_icons_v1 _defaultpath)
set(_lang ${ARGV1})
if(_lang)
set(_l10n_SUBDIR l10n/${_lang})
- else(_lang)
+ else()
set(_l10n_SUBDIR ".")
- endif(_lang)
+ endif()
set(_themes)
@@ -129,7 +129,7 @@ macro(_ecm_install_icons_v1 _defaultpath)
_ECM_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
${_defaultpath}/${_theme_GROUP}/${_size}x${_size}
${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR})
- endif( _theme_GROUP)
+ endif()
endforeach (_current_ICON)
# mng icons
@@ -148,7 +148,7 @@ macro(_ecm_install_icons_v1 _defaultpath)
_ECM_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
${_defaultpath}/${_theme_GROUP}/${_size}x${_size}
${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR})
- endif( _theme_GROUP)
+ endif()
endforeach (_current_ICON)
# and now the svg icons
@@ -166,7 +166,7 @@ macro(_ecm_install_icons_v1 _defaultpath)
_ECM_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
${_defaultpath}/${_theme_GROUP}/scalable
${_group} ${_current_ICON} ${_name} ${_l10n_SUBDIR})
- endif( _theme_GROUP)
+ endif()
endforeach (_current_ICON)
if (_themes)
@@ -189,7 +189,7 @@ macro(_ecm_add_icon_install_rule _install_SCRIPT _install_PATH _group _orig_NAME
if(NOT _icon_GROUP)
message(WARNING "Icon ${_install_NAME} uses invalid category ${_group}, setting to 'actions'")
set(_icon_GROUP "actions")
- endif(NOT _icon_GROUP)
+ endif()
# message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name} l10n: ${_l10n_SUBDIR}")
install(FILES ${_orig_NAME} DESTINATION ${_install_PATH}/${_icon_GROUP}/${_l10n_SUBDIR}/ RENAME ${_install_NAME} )
endif (NOT ${_group} STREQUAL ${_install_NAME} )