From 829a6389f37d0bfb15ca6f68f19ce45abfa24653 Mon Sep 17 00:00:00 2001 From: samelian Date: Sun, 17 Oct 2010 11:17:16 +0000 Subject: [PATCH] [kde-common/cmake] added macro tde_message_fatal git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1186735 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- cmake/modules/TDEMacros.cmake | 12 ++++++++++++ cmake/modules/TDESetupPaths.cmake | 16 ++-------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmake/modules/TDEMacros.cmake b/cmake/modules/TDEMacros.cmake index 985b768..b0d359b 100644 --- a/cmake/modules/TDEMacros.cmake +++ b/cmake/modules/TDEMacros.cmake @@ -1,3 +1,15 @@ +################################################# +##### +##### tde_message_fatal + +macro( tde_message_fatal ) + message( FATAL_ERROR + "#################################################\n" + " ${ARGV}\n" + "#################################################" ) +endmacro( tde_message_fatal ) + + ################################################# ##### ##### tde_install_icons( THEME DESTINATION ) diff --git a/cmake/modules/TDESetupPaths.cmake b/cmake/modules/TDESetupPaths.cmake index 2433999..b28f098 100644 --- a/cmake/modules/TDESetupPaths.cmake +++ b/cmake/modules/TDESetupPaths.cmake @@ -9,18 +9,6 @@ # ################################################# -################################################# -##### -##### __tde_internal_setup_paths_error - -macro( __tde_internal_setup_paths_error ) - message( FATAL_ERROR - "#################################################\n" - " ${ARGV}\n" - "#################################################" ) -endmacro( __tde_internal_setup_paths_error ) - - ################################################# ##### ##### __tde_internal_setup_paths_status @@ -46,7 +34,7 @@ macro( __tde_internal_setup_path __path __default ) RESULT_VARIABLE __result OUTPUT_STRIP_TRAILING_WHITESPACE ) if( __result ) - __tde_internal_setup_paths_error( "Unable to run kde-config!\n kdelibs are correctly installed?\n LD_LIBRARY_PATH are correctly set?" ) + tde_message_fatal( "Unable to run kde-config!\n kdelibs are correctly installed?\n LD_LIBRARY_PATH are correctly set?" ) endif( __result ) endif( _use_kdeconfig AND __kdeconfig_type ) if( ${__path} ) @@ -97,7 +85,7 @@ macro( tde_setup_paths ) HINTS $ENV{KDEDIR}/bin PATHS "${EPREFIX}/bin" "${PREFIX}/bin" "${CMAKE_INSTALL_PREFIX}/bin" ) if( NOT KDECONFIG_EXECUTABLE ) - __tde_internal_setup_paths_error( + tde_message_fatal( "kde-config executable are NOT found! kdelibs(-devel) are installed? EPREFIX are correctly set?