[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kcm-grub2] cmake/modules: Remove unnecessary CMake macros.
From: Konstantinos Smanis <konstantinos.smanis () gmail ! com>
Date: 2013-10-03 0:15:07
Message-ID: E1VRWZP-00046M-Vn () scm ! kde ! org
[Download RAW message or body]
Git commit 1282c41f0179f62819cd9b0780a2f382088e00be by Konstantinos Smanis.
Committed on 03/10/2013 at 00:13.
Pushed by ksmanis into branch 'master'.
Remove unnecessary CMake macros.
These macro files are provided by KDE, we don't need them in our tree.
D +0 -20 cmake/modules/MacroBoolTo01.cmake
D +0 -157 cmake/modules/MacroLogFeature.cmake
D +0 -48 cmake/modules/MacroOptionalFindPackage.cmake
http://commits.kde.org/kcm-grub2/1282c41f0179f62819cd9b0780a2f382088e00be
diff --git a/cmake/modules/MacroBoolTo01.cmake b/cmake/modules/MacroBoolTo01.cmake
deleted file mode 100644
index 63b9852..0000000
--- a/cmake/modules/MacroBoolTo01.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# MACRO_BOOL_TO_01( VAR RESULT0 ... RESULTN )
-# This macro evaluates its first argument
-# and sets all the given vaiables either to 0 or 1
-# depending on the value of the first one
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-MACRO(MACRO_BOOL_TO_01 FOUND_VAR )
- FOREACH (_current_VAR ${ARGN})
- IF(${FOUND_VAR})
- SET(${_current_VAR} 1)
- ELSE(${FOUND_VAR})
- SET(${_current_VAR} 0)
- ENDIF(${FOUND_VAR})
- ENDFOREACH(_current_VAR)
-ENDMACRO(MACRO_BOOL_TO_01)
diff --git a/cmake/modules/MacroLogFeature.cmake \
b/cmake/modules/MacroLogFeature.cmake deleted file mode 100644
index 631c7ac..0000000
--- a/cmake/modules/MacroLogFeature.cmake
+++ /dev/null
@@ -1,157 +0,0 @@
-# This file defines the Feature Logging macros.
-#
-# 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
-# FEATURE: name of the feature, e.g. "libjpeg"
-# DESCRIPTION: description what this feature provides
-# URL: home page
-# REQUIRED: TRUE or FALSE, indicating whether the feature 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 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" \
TRUE "3.2a" "")
-# ...
-# MACRO_DISPLAY_FEATURE_LOG()
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-# Copyright (c) 2006, Allen Winter, <winter@kde.org>
-# Copyright (c) 2009, Sebastian Trueg, <trueg@kde.org>
-#
-# 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)
- 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)
-
- INCLUDE(FeatureSummary)
-
-ENDIF (NOT _macroLogFeatureAlreadyIncluded)
-
-
-MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers \
_comments)
-
- STRING(TOUPPER "${ARGV4}" _required)
- SET(_minvers "${ARGV5}")
- SET(_comments "${ARGV6}")
-
- IF (${_var})
- SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt)
- ELSE (${_var})
- IF ("${_required}" STREQUAL "TRUE")
- SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/MissingRequirements.txt)
- ELSE ("${_required}" STREQUAL "TRUE")
- SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
- ENDIF ("${_required}" STREQUAL "TRUE")
- ENDIF (${_var})
-
- SET(_logtext " * ${_package}")
-
- IF (NOT ${_var})
- IF (${_minvers} MATCHES ".*")
- SET(_logtext "${_logtext} (${_minvers} or higher)")
- ENDIF (${_minvers} MATCHES ".*")
- 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}")
- ENDIF (${_comments} MATCHES ".*")
-# SET(_logtext "${_logtext}\n") #double-space missing features?
- 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)
- SET(_disabledFile ${CMAKE_BINARY_DIR}/DisabledFeatures.txt)
-
- IF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS ${_disabledFile})
- SET(_printSummary TRUE)
- ENDIF (EXISTS ${_missingFile} OR EXISTS ${_enabledFile} OR EXISTS \
${_disabledFile})
-
- 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})
-
-
- 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 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})
-
-
- 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)
diff --git a/cmake/modules/MacroOptionalFindPackage.cmake \
b/cmake/modules/MacroOptionalFindPackage.cmake deleted file mode 100644
index d4ed48e..0000000
--- a/cmake/modules/MacroOptionalFindPackage.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
-# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
-# This macro is a combination of OPTION() and FIND_PACKAGE(), it
-# works like FIND_PACKAGE(), but additionally it automatically creates
-# an option name WITH_<name>, which can be disabled via the cmake GUI.
-# or via -DWITH_<name>=OFF
-# The standard <name>_FOUND variables can be used in the same way
-# as when using the normal FIND_PACKAGE()
-
-# Copyright (c) 2006-2010 Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-# This is just a helper macro to set a bunch of variables empty.
-# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try \
both:
-macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var)
- if(DEFINED ${_name}_${_var})
- set(${_name}_${_var} "")
- endif(DEFINED ${_name}_${_var})
-
- string(TOUPPER ${_name} _nameUpper)
- if(DEFINED ${_nameUpper}_${_var})
- set(${_nameUpper}_${_var} "")
- endif(DEFINED ${_nameUpper}_${_var})
-endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var)
-
-
-macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
- option(WITH_${_name} "Search for ${_name} package" ON)
- if (WITH_${_name})
- find_package(${_name} ${ARGN})
- else (WITH_${_name})
- string(TOUPPER ${_name} _nameUpper)
- set(${_name}_FOUND FALSE)
- set(${_nameUpper}_FOUND FALSE)
-
- _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS)
- _mofp_set_empty_if_defined(${_name} INCLUDE_DIR)
- _mofp_set_empty_if_defined(${_name} INCLUDES)
- _mofp_set_empty_if_defined(${_name} LIBRARY)
- _mofp_set_empty_if_defined(${_name} LIBRARIES)
- _mofp_set_empty_if_defined(${_name} LIBS)
- _mofp_set_empty_if_defined(${_name} FLAGS)
- _mofp_set_empty_if_defined(${_name} DEFINITIONS)
- endif (WITH_${_name})
-endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
-
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic