diff options
| author | Allen Winter <winter@kde.org> | 2006-08-15 23:52:47 +0000 |
|---|---|---|
| committer | Allen Winter <winter@kde.org> | 2006-08-15 23:52:47 +0000 |
| commit | 787e9f69caaecbf91e28578452659f7d4ad15cbd (patch) | |
| tree | 87b890aadc36c4ca773acae30aebdff058e4f31a | |
| parent | 2832cfe864788335be6b3f16426eae0393ce61be (diff) | |
| download | extra-cmake-modules-787e9f69caaecbf91e28578452659f7d4ad15cbd.tar.gz extra-cmake-modules-787e9f69caaecbf91e28578452659f7d4ad15cbd.tar.bz2 | |
remove the init() macro as per Alex's suggestion.
Thanks Alex. This does simplify things.
svn path=/trunk/KDE/kdelibs/; revision=573396
| -rw-r--r-- | modules/MacroLogFeature.cmake | 42 |
1 files changed, 19 insertions, 23 deletions
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 ) |