Git commit 5a5c17da49bc8c0bfc3019b043c07862c3aa7f8d by Bernhard Beschow. Committed on 31/12/2012 at 18:44. Pushed by beschow into branch 'master'. fix feature_summary-macro not being found by CMake under Maemo 5 BUG: 311877 M +1 -1 CMakeLists.txt M +10 -0 MarbleMacros.cmake http://commits.kde.org/marble/5a5c17da49bc8c0bfc3019b043c07862c3aa7f8d diff --git a/CMakeLists.txt b/CMakeLists.txt index 79e2c6a..f8e5a45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -366,4 +366,4 @@ endif(QTONLY) = include(MarbleCPackOptions) = -feature_summary(WHAT ALL) +marble_feature_summary(WHAT ALL) diff --git a/MarbleMacros.cmake b/MarbleMacros.cmake index 6e944c2..a5c2870 100644 --- a/MarbleMacros.cmake +++ b/MarbleMacros.cmake @@ -9,6 +9,16 @@ else() endmacro() endif() = +if ( COMMAND feature_summary ) + macro( marble_feature_summary ) + feature_summary( ${ARGN} ) + endmacro() +else() + macro( marble_feature_summary ) + # Just ignore it + endmacro() +endif() + # the place to put in common cmake macros # this is needed to minimize the amount of errors to do macro( marble_add_plugin _target_name )