From 6647ff1200e2493e4dffd898c17c953fec3483a6 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 16 May 2006 16:54:31 +0000 Subject: -a new cmake module which contains two macros: MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL) Logs the information so that it can be displayed at the end of the configure run VAR : variable which is TRUE or FALSE indicating whether the feature is supported FEATURE: name of the feature, e.g. "libjpeg" DESCRIPTION: description what this feature provides URL: home page MACRO_DISPLAY_FEATURE_LOG() Call this at the end of the toplevel CMakeLists.txt to display the collected results Example: INCLUDE(MacroLogFeature) FIND_PACKAGE(JPEG) MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "Support JPEG images" "http://www.ijg.org") ... MACRO_DISPLAY_FEATURE_LOG() Alex CCMAIL:kde-buildsystem@kde.org svn path=/trunk/KDE/kdelibs/; revision=541576 --- modules/MacroLogFeature.cmake | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 modules/MacroLogFeature.cmake (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake new file mode 100644 index 00000000..dcb3c731 --- /dev/null +++ b/modules/MacroLogFeature.cmake @@ -0,0 +1,58 @@ +# This file defines two macros: +# MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL) +# Logs the information so that it can be displayed at the end +# of the configure run +# VAR : variable which is TRUE or FALSE indicating whether the feature is supported +# FEATURE: name of the feature, e.g. "libjpeg" +# DESCRIPTION: description what this feature provides +# URL: home page +# +# MACRO_DISPLAY_FEATURE_LOG() +# Call this at the end of the toplevel CMakeLists.txt to display the collected results +# +# Example: +# +# INCLUDE(MacroLogFeature) +# +# FIND_PACKAGE(JPEG) +# MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "Support JPEG images" "http://www.ijg.org") +# ... +# MACRO_DISPLAY_FEATURE_LOG() + + + +MACRO(MACRO_LOG_FEATURE _var _package _description _url) + + IF (NOT EXISTS "${CMAKE_BINARY_DIR}/EnabledFeatures.txt") + FILE(WRITE "${CMAKE_BINARY_DIR}/EnabledFeatures.txt" "\n") + ENDIF (NOT EXISTS "${CMAKE_BINARY_DIR}/EnabledFeatures.txt") + + IF (NOT EXISTS "${CMAKE_BINARY_DIR}/DisabledFeatures.txt") + FILE(WRITE "${CMAKE_BINARY_DIR}/DisabledFeatures.txt" "\n") + ENDIF (NOT EXISTS "${CMAKE_BINARY_DIR}/DisabledFeatures.txt") + + + IF (${_var}) + SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt ) + ELSE (${_var}) + SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) + ENDIF (${_var}) + + FILE(APPEND "${_LOGFILENAME}" "PACKAGE: ${_package}\nDESCRIPTION: ${_description}\nURL: ${_url}\n\n") + +ENDMACRO(MACRO_LOG_FEATURE) + + +MACRO(MACRO_DISPLAY_FEATURE_LOG) + IF (EXISTS "${CMAKE_BINARY_DIR}/EnabledFeatures.txt") + FILE(READ ${CMAKE_BINARY_DIR}/EnabledFeatures.txt _features) + MESSAGE(STATUS "Enabled features:\n${_features}") + FILE(REMOVE ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) + ENDIF (EXISTS "${CMAKE_BINARY_DIR}/EnabledFeatures.txt") + + IF (EXISTS "${CMAKE_BINARY_DIR}/DisabledFeatures.txt") + FILE(READ ${CMAKE_BINARY_DIR}/DisabledFeatures.txt _features) + MESSAGE(STATUS "Disabled features:\n${_features}") + FILE(REMOVE ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) + ENDIF (EXISTS "${CMAKE_BINARY_DIR}/DisabledFeatures.txt") +ENDMACRO(MACRO_DISPLAY_FEATURE_LOG) -- cgit v1.2.1 From 318148f110971cdb1fa9bd303c58804e52b6f9db Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sat, 24 Jun 2006 14:35:39 +0000 Subject: now handles required packages. also supports minimum_version and comments fields. approved by aleXXX. svn path=/trunk/KDE/kdelibs/; revision=554598 --- modules/MacroLogFeature.cmake | 94 ++++++++++++++++++++++++++++--------------- 1 file changed, 61 insertions(+), 33 deletions(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index dcb3c731..89c6e0bb 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -1,58 +1,86 @@ # This file defines two macros: -# MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL) -# Logs the information so that it can be displayed at the end -# of the configure run -# VAR : variable which is TRUE or FALSE indicating whether the feature is supported -# FEATURE: name of the feature, e.g. "libjpeg" -# DESCRIPTION: description what this feature provides -# URL: home page +# +# MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL MIN_VERSION COMMENTS) +# Logs the information so that it can be displayed at the end +# of the configure run +# VAR : TRUE or FALSE, indicating whether the feature is supported +# FEATURE: name of the feature, e.g. "libjpeg" +# DESCRIPTION: description what this feature provides +# URL: home page +# REQUIRED: TRUE or FALSE, indicating whether the featue is required +# MIN_VERSION: minimum version number. empty string if unneeded +# COMMENTS: More info you may want to provide. empty string if unnecessary # # MACRO_DISPLAY_FEATURE_LOG() -# Call this at the end of the toplevel CMakeLists.txt to display the collected results +# Call this to display the collected results. +# Exits CMake with a FATAL error message if a required feature is missing # # Example: # # INCLUDE(MacroLogFeature) # # FIND_PACKAGE(JPEG) -# MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "Support JPEG images" "http://www.ijg.org") +# MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "Support JPEG images" "http://www.ijg.org" TRUE "3.2a" "") # ... # MACRO_DISPLAY_FEATURE_LOG() -MACRO(MACRO_LOG_FEATURE _var _package _description _url) - - IF (NOT EXISTS "${CMAKE_BINARY_DIR}/EnabledFeatures.txt") - FILE(WRITE "${CMAKE_BINARY_DIR}/EnabledFeatures.txt" "\n") - ENDIF (NOT EXISTS "${CMAKE_BINARY_DIR}/EnabledFeatures.txt") - - IF (NOT EXISTS "${CMAKE_BINARY_DIR}/DisabledFeatures.txt") - FILE(WRITE "${CMAKE_BINARY_DIR}/DisabledFeatures.txt" "\n") - ENDIF (NOT EXISTS "${CMAKE_BINARY_DIR}/DisabledFeatures.txt") - +MACRO(MACRO_LOG_FEATURE _var _package _description _url _required _minvers _comments) IF (${_var}) - SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt ) + SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt ) ELSE (${_var}) - SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) + IF (${_required}) + SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/MissingRequirements.txt) + ELSE (${_required}) + SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) + ENDIF (${_required}) ENDIF (${_var}) - FILE(APPEND "${_LOGFILENAME}" "PACKAGE: ${_package}\nDESCRIPTION: ${_description}\nURL: ${_url}\n\n") + IF (NOT EXISTS ${_LOGFILENAME}) + FILE(WRITE ${_LOGFILENAME} "\n") + ENDIF (NOT EXISTS ${_LOGFILENAME}) + FILE(APPEND "${_LOGFILENAME}" "=======================================\n") + FILE(APPEND "${_LOGFILENAME}" "PACKAGE: ${_package}\n") + FILE(APPEND "${_LOGFILENAME}" "DESCRIPTION: ${_description}\n") + FILE(APPEND "${_LOGFILENAME}" "URL: ${_url}\n") + IF (${_minvers} MATCHES ".*") + FILE(APPEND "${_LOGFILENAME}" "VERSION: ${_minvers}\n") + ENDIF (${_minvers} MATCHES ".*") + IF (${_comments} MATCHES ".*") + FILE(APPEND "${_LOGFILENAME}" "COMMENTS: ${_comments}\n") + ENDIF (${_comments} MATCHES ".*") + ENDMACRO(MACRO_LOG_FEATURE) MACRO(MACRO_DISPLAY_FEATURE_LOG) - IF (EXISTS "${CMAKE_BINARY_DIR}/EnabledFeatures.txt") - FILE(READ ${CMAKE_BINARY_DIR}/EnabledFeatures.txt _features) - MESSAGE(STATUS "Enabled features:\n${_features}") - FILE(REMOVE ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) - ENDIF (EXISTS "${CMAKE_BINARY_DIR}/EnabledFeatures.txt") - - IF (EXISTS "${CMAKE_BINARY_DIR}/DisabledFeatures.txt") - FILE(READ ${CMAKE_BINARY_DIR}/DisabledFeatures.txt _features) - MESSAGE(STATUS "Disabled features:\n${_features}") - FILE(REMOVE ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) - ENDIF (EXISTS "${CMAKE_BINARY_DIR}/DisabledFeatures.txt") + + SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt ) + IF (EXISTS ${_file}) + FILE(APPEND ${_file} "=======================================") + FILE(READ ${_file} _requirements) + MESSAGE(STATUS "\nMissing Requirements:${_requirements}") + FILE(REMOVE ${_file}) + MESSAGE(FATAL_ERROR "Exiting: Missing Requirements") + ENDIF (EXISTS ${_file}) + + SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt ) + IF (EXISTS ${_file}) + FILE(APPEND ${_file} "=======================================") + FILE(READ ${_file} _enabled) + MESSAGE(STATUS "\nEnabled Features:${_enabled}") + FILE(REMOVE ${_file}) + ENDIF (EXISTS ${_file}) + + SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt ) + IF (EXISTS ${_file}) + FILE(APPEND ${_file} "=======================================") + FILE(READ ${_file} _disabled) + MESSAGE(STATUS "\nDisabled Features:${_disabled}") + FILE(REMOVE ${_file}) + ENDIF (EXISTS ${_file}) + ENDMACRO(MACRO_DISPLAY_FEATURE_LOG) -- cgit v1.2.1 From 26a5b6d0b901f5c6e1c8ef487a95678830ff5dbc Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 4 Jul 2006 19:05:37 +0000 Subject: make the last three options of macro_log_feature() optional, so kdenetwork configures Alex svn path=/trunk/KDE/kdelibs/; revision=558140 --- modules/MacroLogFeature.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index 89c6e0bb..99c4bb5c 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -1,6 +1,6 @@ # This file defines two macros: # -# MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL MIN_VERSION COMMENTS) +# MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL [REQUIRED [MIN_VERSION [COMMENTS]]]) # Logs the information so that it can be displayed at the end # of the configure run # VAR : TRUE or FALSE, indicating whether the feature is supported @@ -26,7 +26,11 @@ -MACRO(MACRO_LOG_FEATURE _var _package _description _url _required _minvers _comments) +MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _comments) + + SET(_required "${ARGV4}") + SET(_minvers "${ARGV5}") + SET(_comments "${ARGV6}") IF (${_var}) SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt ) -- cgit v1.2.1 From 02e5bf8e3d7cc2474f1cfa11aa0bea59efc083d2 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sun, 13 Aug 2006 23:46:33 +0000 Subject: add a new init() macro that should go at the top of each module's toplevel CMakeLists.txt file. init() basically erases any temp files that are left around from previous runs (like if the user hit ^C before cmake completed) svn path=/trunk/KDE/kdelibs/; revision=572796 --- modules/MacroLogFeature.cmake | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index 99c4bb5c..3b92801a 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -1,4 +1,7 @@ -# This file defines two macros: +# This file defines the Feature Logging macros. +# +# MACRO_INIT_LOG_FEATURE() +# Call this to initialize the feature logging facility. # # MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL [REQUIRED [MIN_VERSION [COMMENTS]]]) # Logs the information so that it can be displayed at the end @@ -18,6 +21,7 @@ # Example: # # INCLUDE(MacroLogFeature) +# MACRO_INIT_LOG_FEATURE() # # FIND_PACKAGE(JPEG) # MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "Support JPEG images" "http://www.ijg.org" TRUE "3.2a" "") @@ -60,6 +64,25 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ ENDMACRO(MACRO_LOG_FEATURE) +MACRO(MACRO_INIT_LOG_FEATURE) + + SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt ) + IF (EXISTS ${_file}) + FILE(REMOVE ${_file}) + ENDIF (EXISTS ${_file}) + + SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt ) + IF (EXISTS ${_file}) + FILE(REMOVE ${_file}) + ENDIF (EXISTS ${_file}) + + SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt ) + IF (EXISTS ${_file}) + FILE(REMOVE ${_file}) + ENDIF (EXISTS ${_file}) + +ENDMACRO(MACRO_INIT_LOG_FEATURE) + MACRO(MACRO_DISPLAY_FEATURE_LOG) SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt ) -- cgit v1.2.1 From 533e58be3610da2da0d0058bedd8e7a35d6fb042 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 14 Aug 2006 01:02:11 +0000 Subject: fix handling of required features. svn path=/trunk/KDE/kdelibs/; revision=572807 --- modules/MacroLogFeature.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index 3b92801a..589a1d1b 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -39,11 +39,11 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ IF (${_var}) SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt ) ELSE (${_var}) - IF (${_required}) + IF (${_required} MATCHES "[Tt][Rr][Uu][Ee]") SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/MissingRequirements.txt) - ELSE (${_required}) + ELSE (${_required} MATCHES "[Tt][Rr][Uu][Ee]") SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) - ENDIF (${_required}) + ENDIF (${_required} MATCHES "[Tt][Rr][Uu][Ee]") ENDIF (${_var}) IF (NOT EXISTS ${_LOGFILENAME}) -- cgit v1.2.1 From 787e9f69caaecbf91e28578452659f7d4ad15cbd Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Tue, 15 Aug 2006 23:52:47 +0000 Subject: remove the init() macro as per Alex's suggestion. Thanks Alex. This does simplify things. svn path=/trunk/KDE/kdelibs/; revision=573396 --- modules/MacroLogFeature.cmake | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index 589a1d1b..434fefb9 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -1,8 +1,5 @@ # This file defines the Feature Logging macros. # -# MACRO_INIT_LOG_FEATURE() -# Call this to initialize the feature logging facility. -# # MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL [REQUIRED [MIN_VERSION [COMMENTS]]]) # Logs the information so that it can be displayed at the end # of the configure run @@ -21,7 +18,6 @@ # Example: # # INCLUDE(MacroLogFeature) -# MACRO_INIT_LOG_FEATURE() # # FIND_PACKAGE(JPEG) # MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "Support JPEG images" "http://www.ijg.org" TRUE "3.2a" "") @@ -29,6 +25,25 @@ # MACRO_DISPLAY_FEATURE_LOG() +IF (NOT _macroLogFeatureAlreadyIncluded) + SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt ) + IF (EXISTS ${_file}) + FILE(REMOVE ${_file}) + ENDIF (EXISTS ${_file}) + + SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt ) + IF (EXISTS ${_file}) + FILE(REMOVE ${_file}) + ENDIF (EXISTS ${_file}) + + SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt ) + IF (EXISTS ${_file}) + FILE(REMOVE ${_file}) + ENDIF (EXISTS ${_file}) + + SET(_macroLogFeatureAlreadyIncluded TRUE) +ENDIF (NOT _macroLogFeatureAlreadyIncluded) + MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _comments) @@ -64,25 +79,6 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ ENDMACRO(MACRO_LOG_FEATURE) -MACRO(MACRO_INIT_LOG_FEATURE) - - SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt ) - IF (EXISTS ${_file}) - FILE(REMOVE ${_file}) - ENDIF (EXISTS ${_file}) - - SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt ) - IF (EXISTS ${_file}) - FILE(REMOVE ${_file}) - ENDIF (EXISTS ${_file}) - - SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt ) - IF (EXISTS ${_file}) - FILE(REMOVE ${_file}) - ENDIF (EXISTS ${_file}) - -ENDMACRO(MACRO_INIT_LOG_FEATURE) - MACRO(MACRO_DISPLAY_FEATURE_LOG) SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt ) -- cgit v1.2.1 From c778596920e0d5357f216c885e35b4f97d371a23 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 9 Sep 2006 10:18:35 +0000 Subject: added copyright notice everywhere. Now they all are BSD-licensed, as copyright holder I inserted everywhere the one who added it to svn (or Kitware if it is an enhanced copy from taken cmake) Some developers committed quite often but were not the ones who added the file, if you feel you have also copyright on the file add your name in the specific file. Copyright holders: CCMAIL: montel@kde.org CCMAIL: toscano.pino@tiscali.it CCMAIL: adymo@kdevelop.org CCMAIL: ranger@befunk.com CCMAIL: zack@kde.org CCMAIL: caslav.ilic@gmx.net CCMAIL: syntheticpp@yahoo.com CCMAIL: js@iidea.pl CCMAIL: michael.larouche@kdemail.net CCMAIL: ossi@kde.org CCMAIL: faure@kde.org Committers, but no files added so that they are not listed as copyright holders: CCMAIL: ch.ehrlicher@gmx.de CCMAIL: winter@kde.org CCMAIL: ralf.habacker@freenet.de CCMAIL: moura@kdewebdev.org CCMAIL: kde-buildsystem@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=582410 --- modules/MacroLogFeature.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index 434fefb9..169775d0 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -24,6 +24,10 @@ # ... # MACRO_DISPLAY_FEATURE_LOG() +# Copyright (c) 2006, Alexander Neundorf, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. IF (NOT _macroLogFeatureAlreadyIncluded) SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt ) -- cgit v1.2.1 From 6db30c9475c18c4ef175ae88d6f087839ac01eb3 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sat, 9 Sep 2006 13:40:42 +0000 Subject: add my copyright. svn path=/trunk/KDE/kdelibs/; revision=582472 --- modules/MacroLogFeature.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index 169775d0..41c150e3 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -25,6 +25,7 @@ # MACRO_DISPLAY_FEATURE_LOG() # Copyright (c) 2006, Alexander Neundorf, +# Copyright (c) 2006, Allen Winter, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- cgit v1.2.1 From a96d6cc8f9edfa3fa7eb12f3c22b7b573da97a0e Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 5 Nov 2006 23:56:38 +0000 Subject: -make the format of macro_log_feature less verbose Alex CCMAIL: winter@kde.org, groot@kde.org Feel free to change it as you like it svn path=/trunk/KDE/kdelibs/; revision=602437 --- modules/MacroLogFeature.cmake | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index 41c150e3..c4ee4079 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -66,20 +66,15 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ ENDIF (${_required} MATCHES "[Tt][Rr][Uu][Ee]") ENDIF (${_var}) - IF (NOT EXISTS ${_LOGFILENAME}) - FILE(WRITE ${_LOGFILENAME} "\n") - ENDIF (NOT EXISTS ${_LOGFILENAME}) - - FILE(APPEND "${_LOGFILENAME}" "=======================================\n") - FILE(APPEND "${_LOGFILENAME}" "PACKAGE: ${_package}\n") - FILE(APPEND "${_LOGFILENAME}" "DESCRIPTION: ${_description}\n") - FILE(APPEND "${_LOGFILENAME}" "URL: ${_url}\n") + SET(_logtext " ${_package}:\t ${_description}; ${_url};") + IF (${_minvers} MATCHES ".*") - FILE(APPEND "${_LOGFILENAME}" "VERSION: ${_minvers}\n") + SET(_logtext "${_logtext} ${_minvers};") ENDIF (${_minvers} MATCHES ".*") IF (${_comments} MATCHES ".*") - FILE(APPEND "${_LOGFILENAME}" "COMMENTS: ${_comments}\n") + SET(_logtext "${_logtext} ${_comments};") ENDIF (${_comments} MATCHES ".*") + FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n") ENDMACRO(MACRO_LOG_FEATURE) @@ -88,27 +83,26 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt ) IF (EXISTS ${_file}) - FILE(APPEND ${_file} "=======================================") FILE(READ ${_file} _requirements) - MESSAGE(STATUS "\nMissing Requirements:${_requirements}") + MESSAGE(STATUS "MISSING REQUIREMENTS\n${_requirements}\n") FILE(REMOVE ${_file}) MESSAGE(FATAL_ERROR "Exiting: Missing Requirements") ENDIF (EXISTS ${_file}) + SET(_summary "\nFEATURE SUMMARY\n----------------\n") SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt ) IF (EXISTS ${_file}) - FILE(APPEND ${_file} "=======================================") FILE(READ ${_file} _enabled) - MESSAGE(STATUS "\nEnabled Features:${_enabled}") FILE(REMOVE ${_file}) + SET(_summary "${_summary}\nEnabled Features:\n${_enabled}") ENDIF (EXISTS ${_file}) SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt ) IF (EXISTS ${_file}) - FILE(APPEND ${_file} "=======================================") FILE(READ ${_file} _disabled) - MESSAGE(STATUS "\nDisabled Features:${_disabled}") FILE(REMOVE ${_file}) + SET(_summary "${_summary}\nDisabled Features:\n${_disabled}") ENDIF (EXISTS ${_file}) + MESSAGE(STATUS "${_summary}") ENDMACRO(MACRO_DISPLAY_FEATURE_LOG) -- cgit v1.2.1 From 8d1a3f70f2c884a0eb55958765543fed85bb2972 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 6 Nov 2006 01:54:33 +0000 Subject: I had to make the logging more verbose and easier to read. Sure, we want something that can be easy to parse by machine, but more important to make it human-readable, IMO. CCMAIL: neundorf@kde.org, groot@kde.org svn path=/trunk/KDE/kdelibs/; revision=602461 --- modules/MacroLogFeature.cmake | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index c4ee4079..55f7b69f 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -31,17 +31,17 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. IF (NOT _macroLogFeatureAlreadyIncluded) - SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt ) + SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt) IF (EXISTS ${_file}) FILE(REMOVE ${_file}) ENDIF (EXISTS ${_file}) - SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt ) + SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) IF (EXISTS ${_file}) FILE(REMOVE ${_file}) ENDIF (EXISTS ${_file}) - SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt ) + SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) IF (EXISTS ${_file}) FILE(REMOVE ${_file}) ENDIF (EXISTS ${_file}) @@ -57,7 +57,7 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ SET(_comments "${ARGV6}") IF (${_var}) - SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt ) + SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) ELSE (${_var}) IF (${_required} MATCHES "[Tt][Rr][Uu][Ee]") SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/MissingRequirements.txt) @@ -66,42 +66,46 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ ENDIF (${_required} MATCHES "[Tt][Rr][Uu][Ee]") ENDIF (${_var}) - SET(_logtext " ${_package}:\t ${_description}; ${_url};") + SET(_logtext "> ${_package}") IF (${_minvers} MATCHES ".*") - SET(_logtext "${_logtext} ${_minvers};") + SET(_logtext "${_logtext}, ${_minvers}") ENDIF (${_minvers} MATCHES ".*") + SET(_logtext "${_logtext}: ${_description}; ${_url};") IF (${_comments} MATCHES ".*") - SET(_logtext "${_logtext} ${_comments};") + SET(_logtext "${_logtext}\n${_comments}") ENDIF (${_comments} MATCHES ".*") - FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n") + FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n\n") ENDMACRO(MACRO_LOG_FEATURE) MACRO(MACRO_DISPLAY_FEATURE_LOG) - SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt ) + SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt) IF (EXISTS ${_file}) FILE(READ ${_file} _requirements) - MESSAGE(STATUS "MISSING REQUIREMENTS\n${_requirements}\n") + MESSAGE(STATUS "\n----------------------------------------------------------------------------------\n-- The following list of REQUIRED packages could not be located on your system. --\n-- Please install them before continuing with this software installation. --\n----------------------------------------------------------------------------------\n${_requirements}----------------------------------------------------------------------------------") +# MESSAGE(STATUS "MISSING REQUIREMENTS\n${_requirements}\n") FILE(REMOVE ${_file}) MESSAGE(FATAL_ERROR "Exiting: Missing Requirements") ENDIF (EXISTS ${_file}) - SET(_summary "\nFEATURE SUMMARY\n----------------\n") - SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt ) + SET(_summary "\n") + SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) IF (EXISTS ${_file}) FILE(READ ${_file} _enabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}\nEnabled Features:\n${_enabled}") + SET(_summary "${_summary}----------------------------------------------------------------------------------\n-- The following list of OPTIONAL packages were located on your system. --\n-- You will have all the following features available from this software. --\n----------------------------------------------------------------------------------\n${_enabled}") +# SET(_summary "${_summary}Enabled Features:\n${_enabled}") ENDIF (EXISTS ${_file}) - SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt ) + SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) IF (EXISTS ${_file}) FILE(READ ${_file} _disabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}\nDisabled Features:\n${_disabled}") + SET(_summary "${_summary}----------------------------------------------------------------------------------\n-- The following list of OPTIONAL packages could not be located on your system. --\n-- Please consider installing them to enable more features of this software. --\n----------------------------------------------------------------------------------\n${_disabled}") +# SET(_summary "${_summary}Disabled Features:\n${_disabled}") ENDIF (EXISTS ${_file}) MESSAGE(STATUS "${_summary}") -- cgit v1.2.1 From cef8870c20ee21908f0b7aa8d83523ff6bb655e3 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Fri, 2 Mar 2007 18:58:48 +0000 Subject: formatting fixups svn path=/trunk/KDE/kdelibs/; revision=638627 --- modules/MacroLogFeature.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index 55f7b69f..f48a6cc2 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -66,12 +66,12 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ ENDIF (${_required} MATCHES "[Tt][Rr][Uu][Ee]") ENDIF (${_var}) - SET(_logtext "> ${_package}") + SET(_logtext "+ ${_package}") IF (${_minvers} MATCHES ".*") SET(_logtext "${_logtext}, ${_minvers}") ENDIF (${_minvers} MATCHES ".*") - SET(_logtext "${_logtext}: ${_description}; ${_url};") + SET(_logtext "${_logtext}: ${_description} <${_url}>") IF (${_comments} MATCHES ".*") SET(_logtext "${_logtext}\n${_comments}") ENDIF (${_comments} MATCHES ".*") @@ -96,7 +96,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) IF (EXISTS ${_file}) FILE(READ ${_file} _enabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}----------------------------------------------------------------------------------\n-- The following list of OPTIONAL packages were located on your system. --\n-- You will have all the following features available from this software. --\n----------------------------------------------------------------------------------\n${_enabled}") + SET(_summary "${_summary}--------------------------------------------------------------------------------\n-- The following list of packages were located on your system. --\n-- You will have all the following features available from this software. --\n--------------------------------------------------------------------------------\n${_enabled}") # SET(_summary "${_summary}Enabled Features:\n${_enabled}") ENDIF (EXISTS ${_file}) @@ -104,7 +104,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) IF (EXISTS ${_file}) FILE(READ ${_file} _disabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}----------------------------------------------------------------------------------\n-- The following list of OPTIONAL packages could not be located on your system. --\n-- Please consider installing them to enable more features of this software. --\n----------------------------------------------------------------------------------\n${_disabled}") + SET(_summary "${_summary}--------------------------------------------------------------------------------\n-- The following list of packages could not be located on your system. --\n-- Consider installing them to enable more features from this software. --\n--------------------------------------------------------------------------------\n${_disabled}") # SET(_summary "${_summary}Disabled Features:\n${_disabled}") ENDIF (EXISTS ${_file}) MESSAGE(STATUS "${_summary}") -- cgit v1.2.1 From a773428a4a784021059733ca9d658384de461e8e Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Fri, 2 Mar 2007 20:54:21 +0000 Subject: trying to make the output easier to parse. is this any better? svn path=/trunk/KDE/kdelibs/; revision=638668 --- modules/MacroLogFeature.cmake | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index f48a6cc2..db2723b6 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -68,14 +68,17 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ SET(_logtext "+ ${_package}") - IF (${_minvers} MATCHES ".*") - SET(_logtext "${_logtext}, ${_minvers}") - ENDIF (${_minvers} MATCHES ".*") - SET(_logtext "${_logtext}: ${_description} <${_url}>") - IF (${_comments} MATCHES ".*") - SET(_logtext "${_logtext}\n${_comments}") - ENDIF (${_comments} MATCHES ".*") - FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n\n") + IF (NOT ${_var}) + IF (${_minvers} MATCHES ".*") + SET(_logtext "${_logtext}, ${_minvers}") + ENDIF (${_minvers} MATCHES ".*") + SET(_logtext "${_logtext}: ${_description} <${_url}>") + IF (${_comments} MATCHES ".*") + SET(_logtext "${_logtext}\n${_comments}") + ENDIF (${_comments} MATCHES ".*") +# SET(_logtext "${_logtext}\n") #double-space missing features? + ENDIF (NOT ${_var}) + FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n") ENDMACRO(MACRO_LOG_FEATURE) @@ -85,28 +88,27 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt) IF (EXISTS ${_file}) FILE(READ ${_file} _requirements) - MESSAGE(STATUS "\n----------------------------------------------------------------------------------\n-- The following list of REQUIRED packages could not be located on your system. --\n-- Please install them before continuing with this software installation. --\n----------------------------------------------------------------------------------\n${_requirements}----------------------------------------------------------------------------------") -# MESSAGE(STATUS "MISSING REQUIREMENTS\n${_requirements}\n") + MESSAGE(STATUS "\n----------------------------------------------------------------------------------\n-- The following list of REQUIRED packages could NOT be located on your system. --\n-- Please install them before continuing with this software installation. --\n----------------------------------------------------------------------------------\n${_requirements}----------------------------------------------------------------------------------") FILE(REMOVE ${_file}) MESSAGE(FATAL_ERROR "Exiting: Missing Requirements") ENDIF (EXISTS ${_file}) SET(_summary "\n") + SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) IF (EXISTS ${_file}) FILE(READ ${_file} _enabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}--------------------------------------------------------------------------------\n-- The following list of packages were located on your system. --\n-- You will have all the following features available from this software. --\n--------------------------------------------------------------------------------\n${_enabled}") -# SET(_summary "${_summary}Enabled Features:\n${_enabled}") + SET(_summary "${_summary}----------------------------------------------------------------------------------\n-- The following list of OPTIONAL packages were located on your system. --\n-- You will have all the following features available from this software. --\n----------------------------------------------------------------------------------\n${_enabled}") ENDIF (EXISTS ${_file}) SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) IF (EXISTS ${_file}) FILE(READ ${_file} _disabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}--------------------------------------------------------------------------------\n-- The following list of packages could not be located on your system. --\n-- Consider installing them to enable more features from this software. --\n--------------------------------------------------------------------------------\n${_disabled}") -# SET(_summary "${_summary}Disabled Features:\n${_disabled}") + SET(_summary "${_summary}----------------------------------------------------------------------------------\n-- The following list of OPTIONAL packages could NOT be located on your system. --\n-- Consider installing them to enable more features from this software. --\n----------------------------------------------------------------------------------\n${_disabled}") ENDIF (EXISTS ${_file}) + MESSAGE(STATUS "${_summary}") ENDMACRO(MACRO_DISPLAY_FEATURE_LOG) -- cgit v1.2.1 From b5ef260fcbaabe41644d184c18c64f0b2b3ba8e9 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Thu, 1 Nov 2007 14:31:07 +0000 Subject: print the log headers in less than 80 chars so they fit nicely on typical vt100s svn path=/trunk/KDE/kdelibs/; revision=731676 --- modules/MacroLogFeature.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index db2723b6..cac4ef87 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -88,7 +88,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt) IF (EXISTS ${_file}) FILE(READ ${_file} _requirements) - MESSAGE(STATUS "\n----------------------------------------------------------------------------------\n-- The following list of REQUIRED packages could NOT be located on your system. --\n-- Please install them before continuing with this software installation. --\n----------------------------------------------------------------------------------\n${_requirements}----------------------------------------------------------------------------------") + MESSAGE(STATUS "\n-------------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system. --\n-- Please install them before continuing with this software installation. --\n-------------------------------------------------------------------------------\n${_requirements}-------------------------------------------------------------------------------") FILE(REMOVE ${_file}) MESSAGE(FATAL_ERROR "Exiting: Missing Requirements") ENDIF (EXISTS ${_file}) @@ -99,14 +99,14 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) IF (EXISTS ${_file}) FILE(READ ${_file} _enabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}----------------------------------------------------------------------------------\n-- The following list of OPTIONAL packages were located on your system. --\n-- You will have all the following features available from this software. --\n----------------------------------------------------------------------------------\n${_enabled}") + SET(_summary "${_summary}-------------------------------------------------------------------------------\n-- The following OPTIONAL packages were located on your system. --\n-- This software installation will have features provided by these packages. --\n-------------------------------------------------------------------------------\n${_enabled}") ENDIF (EXISTS ${_file}) SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) IF (EXISTS ${_file}) FILE(READ ${_file} _disabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}----------------------------------------------------------------------------------\n-- The following list of OPTIONAL packages could NOT be located on your system. --\n-- Consider installing them to enable more features from this software. --\n----------------------------------------------------------------------------------\n${_disabled}") + SET(_summary "${_summary}-------------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system. --\n-- Consider installing them to enable more features from this software. --\n-------------------------------------------------------------------------------\n${_disabled}") ENDIF (EXISTS ${_file}) MESSAGE(STATUS "${_summary}") -- cgit v1.2.1 From d5e405ffeae838614d49dd94f30cc13451065eb1 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sat, 12 Jan 2008 16:34:14 +0000 Subject: - if all packages were found, provide a message saying so - cleanup the output a little. - not all found packages are optional; some are required. so reduce confusion by saying "external" instead. svn path=/trunk/KDE/kdelibs/; revision=760423 --- modules/MacroLogFeature.cmake | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index cac4ef87..f0f39882 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -88,27 +88,38 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt) IF (EXISTS ${_file}) FILE(READ ${_file} _requirements) - MESSAGE(STATUS "\n-------------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system. --\n-- Please install them before continuing with this software installation. --\n-------------------------------------------------------------------------------\n${_requirements}-------------------------------------------------------------------------------") + MESSAGE(STATUS "\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- Please install them before continuing this software installation.\n-----------------------------------------------------------------------------\n${_requirements}-----------------------------------------------------------------------------") FILE(REMOVE ${_file}) MESSAGE(FATAL_ERROR "Exiting: Missing Requirements") ENDIF (EXISTS ${_file}) SET(_summary "\n") + SET(_elist 0) SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) IF (EXISTS ${_file}) + SET(_elist 1) FILE(READ ${_file} _enabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}-------------------------------------------------------------------------------\n-- The following OPTIONAL packages were located on your system. --\n-- This software installation will have features provided by these packages. --\n-------------------------------------------------------------------------------\n${_enabled}") + SET(_summary "${_summary}-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n${_enabled}") ENDIF (EXISTS ${_file}) + SET(_dlist 0) SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) IF (EXISTS ${_file}) + SET(_dlist 1) FILE(READ ${_file} _disabled) FILE(REMOVE ${_file}) - SET(_summary "${_summary}-------------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system. --\n-- Consider installing them to enable more features from this software. --\n-------------------------------------------------------------------------------\n${_disabled}") + SET(_summary "${_summary}-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n${_disabled}") + ELSE (EXISTS ${_file}) + IF (${_elist}) + SET(_summary "${_summary}Congratulations! All external packages have been found.\n") + ENDIF (${_elist}) ENDIF (EXISTS ${_file}) + IF (${_elist} OR ${_dlist}) + SET(_summary "${_summary}-----------------------------------------------------------------------------\n") + ENDIF (${_elist} OR ${_dlist}) MESSAGE(STATUS "${_summary}") ENDMACRO(MACRO_DISPLAY_FEATURE_LOG) -- cgit v1.2.1 From f5a97932d02a33bb9c78c7aae074a9cc86cc73aa Mon Sep 17 00:00:00 2001 From: Thorsten Staerk Date: Sat, 15 Nov 2008 17:33:49 +0000 Subject: Tell the correct version information about needed libraries. BUGS:175232 svn path=/trunk/KDE/kdelibs/; revision=884713 --- modules/MacroLogFeature.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index f0f39882..11861b95 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -70,7 +70,7 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ IF (NOT ${_var}) IF (${_minvers} MATCHES ".*") - SET(_logtext "${_logtext}, ${_minvers}") + SET(_logtext "${_logtext}, ${_minvers} or higher") ENDIF (${_minvers} MATCHES ".*") SET(_logtext "${_logtext}: ${_description} <${_url}>") IF (${_comments} MATCHES ".*") -- cgit v1.2.1 From 9ae1c29f129e722f31fa0aaa7fa90b994f73788f Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Mon, 23 Feb 2009 20:21:06 +0000 Subject: New layout for the cmake summary as discussed on kde-buildsystem. Will backport to 4.2 soon. svn path=/trunk/KDE/kdelibs/; revision=930559 --- modules/MacroLogFeature.cmake | 93 ++++++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 36 deletions(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index 11861b95..21f6ddbd 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -26,6 +26,7 @@ # Copyright (c) 2006, Alexander Neundorf, # Copyright (c) 2006, Allen Winter, +# Copyright (c) 2009, Sebastian Trueg, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -66,18 +67,26 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ ENDIF (${_required} MATCHES "[Tt][Rr][Uu][Ee]") ENDIF (${_var}) - SET(_logtext "+ ${_package}") + SET(_logtext " * ${_package}") IF (NOT ${_var}) IF (${_minvers} MATCHES ".*") - SET(_logtext "${_logtext}, ${_minvers} or higher") + SET(_logtext "${_logtext} (${_minvers} or higher)") ENDIF (${_minvers} MATCHES ".*") - SET(_logtext "${_logtext}: ${_description} <${_url}>") + SET(_logtext "${_logtext} <${_url}>\n ") + ELSE (NOT ${_var}) + SET(_logtext "${_logtext} - ") + ENDIF (NOT ${_var}) + + SET(_logtext "${_logtext}${_description}") + + IF (NOT ${_var}) IF (${_comments} MATCHES ".*") - SET(_logtext "${_logtext}\n${_comments}") + SET(_logtext "${_logtext}\n ${_comments}") ENDIF (${_comments} MATCHES ".*") # SET(_logtext "${_logtext}\n") #double-space missing features? ENDIF (NOT ${_var}) + FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n") ENDMACRO(MACRO_LOG_FEATURE) @@ -85,41 +94,53 @@ ENDMACRO(MACRO_LOG_FEATURE) MACRO(MACRO_DISPLAY_FEATURE_LOG) - SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt) - IF (EXISTS ${_file}) - FILE(READ ${_file} _requirements) - MESSAGE(STATUS "\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- Please install them before continuing this software installation.\n-----------------------------------------------------------------------------\n${_requirements}-----------------------------------------------------------------------------") - FILE(REMOVE ${_file}) - MESSAGE(FATAL_ERROR "Exiting: Missing Requirements") - ENDIF (EXISTS ${_file}) + SET(_missingFile ${CMAKE_BINARY_DIR}/MissingRequirements.txt) + SET(_enabledFile ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) + SET(_disabledFile ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) - SET(_summary "\n") + IF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile}) + SET(_printSummary TRUE) + ENDIF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile}) - SET(_elist 0) - SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) - IF (EXISTS ${_file}) - SET(_elist 1) - FILE(READ ${_file} _enabled) - FILE(REMOVE ${_file}) - SET(_summary "${_summary}-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n${_enabled}") - ENDIF (EXISTS ${_file}) + IF(_printSummary) + SET(_missingDeps 0) + IF (EXISTS ${_enabledFile}) + FILE(READ ${_enabledFile} _enabled) + FILE(REMOVE ${_enabledFile}) + SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n-----------------------------------------------------------------------------\n${_enabled}") + ENDIF (EXISTS ${_enabledFile}) - SET(_dlist 0) - SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) - IF (EXISTS ${_file}) - SET(_dlist 1) - FILE(READ ${_file} _disabled) - FILE(REMOVE ${_file}) - SET(_summary "${_summary}-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n${_disabled}") - ELSE (EXISTS ${_file}) - IF (${_elist}) - SET(_summary "${_summary}Congratulations! All external packages have been found.\n") - ENDIF (${_elist}) - ENDIF (EXISTS ${_file}) - IF (${_elist} OR ${_dlist}) - SET(_summary "${_summary}-----------------------------------------------------------------------------\n") - ENDIF (${_elist} OR ${_dlist}) - MESSAGE(STATUS "${_summary}") + IF (EXISTS ${_disabledFile}) + SET(_missingDeps 1) + FILE(READ ${_disabledFile} _disabled) + FILE(REMOVE ${_disabledFile}) + SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n-----------------------------------------------------------------------------\n${_disabled}") + ENDIF (EXISTS ${_disabledFile}) + + + IF (EXISTS ${_missingFile}) + SET(_missingDeps 1) + FILE(READ ${_missingFile} _requirements) + SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n-----------------------------------------------------------------------------\n${_requirements}") + FILE(REMOVE ${_missingFile}) + SET(_haveMissingReq 1) + ENDIF (EXISTS ${_missingFile}) + + + IF (NOT ${_missingDeps}) + SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- Congratulations! All external packages have been found.") + ENDIF (NOT ${_missingDeps}) + + + MESSAGE(${_summary}) + MESSAGE("-----------------------------------------------------------------------------\n") + + + IF(_haveMissingReq) + MESSAGE(FATAL_ERROR "Exiting: Missing Requirements") + ENDIF(_haveMissingReq) + + ENDIF(_printSummary) ENDMACRO(MACRO_DISPLAY_FEATURE_LOG) -- cgit v1.2.1 From 3613f31ef1873544c274a1b77365e53464b720db Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sun, 1 Mar 2009 17:19:39 +0000 Subject: fix a typo where OPTIONAL could be printed for missing *required* features. svn path=/trunk/KDE/kdelibs/; revision=933810 --- modules/MacroLogFeature.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index 21f6ddbd..ebaf9d18 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -122,7 +122,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) IF (EXISTS ${_missingFile}) SET(_missingDeps 1) FILE(READ ${_missingFile} _requirements) - SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n-----------------------------------------------------------------------------\n${_requirements}") + SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n-----------------------------------------------------------------------------\n${_requirements}") FILE(REMOVE ${_missingFile}) SET(_haveMissingReq 1) ENDIF (EXISTS ${_missingFile}) -- cgit v1.2.1 From 10cc4b25a49c97e7b7d84cd60f8b2d6df8492743 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Fri, 10 Apr 2009 20:32:18 +0000 Subject: Fix the info message when REQUIRED packages are not found. svn path=/trunk/KDE/kdelibs/; revision=952070 --- modules/MacroLogFeature.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index ebaf9d18..9a487687 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -122,7 +122,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) IF (EXISTS ${_missingFile}) SET(_missingDeps 1) FILE(READ ${_missingFile} _requirements) - SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n-----------------------------------------------------------------------------\n${_requirements}") + SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- You must install them before this software installation can continue.\n-----------------------------------------------------------------------------\n${_requirements}") FILE(REMOVE ${_missingFile}) SET(_haveMissingReq 1) ENDIF (EXISTS ${_missingFile}) -- cgit v1.2.1 From 2d26fb16c057cfbd17c099bf113ec66ef1e9370c Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Fri, 10 Apr 2009 20:49:45 +0000 Subject: another try at making a nice message when a required package cannot be found. svn path=/trunk/KDE/kdelibs/; revision=952076 --- modules/MacroLogFeature.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index 9a487687..5db50edf 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -122,7 +122,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG) IF (EXISTS ${_missingFile}) SET(_missingDeps 1) FILE(READ ${_missingFile} _requirements) - SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- You must install them before this software installation can continue.\n-----------------------------------------------------------------------------\n${_requirements}") + SET(_summary "${_summary}\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- You must install these packages before continuing.\n-----------------------------------------------------------------------------\n${_requirements}") FILE(REMOVE ${_missingFile}) SET(_haveMissingReq 1) ENDIF (EXISTS ${_missingFile}) -- cgit v1.2.1 From 9f7fb0716ac8c80ff11b20da4830a0e7a0066599 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 5 Oct 2009 17:48:24 +0000 Subject: -don't use the internal macro from FindQt4.cmake here -use string(TOUPPER ... ) to make testing the value easier Alex svn path=/trunk/KDE/kdelibs/; revision=1031656 --- modules/MacroLogFeature.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index 5db50edf..541078c8 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -53,18 +53,18 @@ ENDIF (NOT _macroLogFeatureAlreadyIncluded) MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _comments) - SET(_required "${ARGV4}") + STRING(TOUPPER "${ARGV4}" _required) SET(_minvers "${ARGV5}") SET(_comments "${ARGV6}") - + IF (${_var}) SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) ELSE (${_var}) - IF (${_required} MATCHES "[Tt][Rr][Uu][Ee]") + IF ("${_required}" STREQUAL "TRUE") SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/MissingRequirements.txt) - ELSE (${_required} MATCHES "[Tt][Rr][Uu][Ee]") + ELSE ("${_required}" STREQUAL "TRUE") SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) - ENDIF (${_required} MATCHES "[Tt][Rr][Uu][Ee]") + ENDIF ("${_required}" STREQUAL "TRUE") ENDIF (${_var}) SET(_logtext " * ${_package}") -- cgit v1.2.1 From 5912d28d7655006223e205ef7b01962216abdcff Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 21 Sep 2010 20:55:35 +0000 Subject: -when using cmake >= 2.8.3, use FeatureSummary.cmake to automatically create a log file for all find_package() calls. As discussed at Akademy, this can be used by build maintainers to be notified for changing requirements Alex svn path=/trunk/KDE/kdelibs/; revision=1177972 --- modules/MacroLogFeature.cmake | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'modules/MacroLogFeature.cmake') diff --git a/modules/MacroLogFeature.cmake b/modules/MacroLogFeature.cmake index 541078c8..45e27b6d 100644 --- a/modules/MacroLogFeature.cmake +++ b/modules/MacroLogFeature.cmake @@ -48,6 +48,9 @@ IF (NOT _macroLogFeatureAlreadyIncluded) ENDIF (EXISTS ${_file}) SET(_macroLogFeatureAlreadyIncluded TRUE) + + INCLUDE(FeatureSummary) + ENDIF (NOT _macroLogFeatureAlreadyIncluded) @@ -56,7 +59,7 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ STRING(TOUPPER "${ARGV4}" _required) SET(_minvers "${ARGV5}") SET(_comments "${ARGV6}") - + IF (${_var}) SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) ELSE (${_var}) @@ -88,11 +91,19 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _ ENDIF (NOT ${_var}) FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n") - + + IF(COMMAND SET_PACKAGE_INFO) # in FeatureSummary.cmake since CMake 2.8.3 + SET_PACKAGE_INFO("${_package}" "\"${_description}\"" "${_url}" "\"${_comments}\"") + ENDIF(COMMAND SET_PACKAGE_INFO) + ENDMACRO(MACRO_LOG_FEATURE) MACRO(MACRO_DISPLAY_FEATURE_LOG) + IF(COMMAND FEATURE_SUMMARY) # in FeatureSummary.cmake since CMake 2.8.3 + FEATURE_SUMMARY(FILENAME ${CMAKE_CURRENT_BINARY_DIR}/FindPackageLog.txt + WHAT ALL) + ENDIF(COMMAND FEATURE_SUMMARY) SET(_missingFile ${CMAKE_BINARY_DIR}/MissingRequirements.txt) SET(_enabledFile ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) -- cgit v1.2.1