summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-04-10 19:19:51 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-04-10 19:19:51 (GMT)
commit194545643a374e63f26911b26812cc6028b965a4 (patch)
treeb1c166906e3421e727f3ad468925bb2baefb75ea /Modules
parent23dcf6ecd096a8f5cf66e277a6133d3d6cb4970e (diff)
parent5adb6b7a34fc67ed49d8f70c1b5b57ca808ef2c4 (diff)
downloadCMake-194545643a374e63f26911b26812cc6028b965a4.zip
CMake-194545643a374e63f26911b26812cc6028b965a4.tar.gz
CMake-194545643a374e63f26911b26812cc6028b965a4.tar.bz2
Merge topic 'check_include_files_output'
5adb6b7 CheckIncludeFiles: Shorten check description message
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CheckIncludeFiles.cmake18
1 files changed, 14 insertions, 4 deletions
diff --git a/Modules/CheckIncludeFiles.cmake b/Modules/CheckIncludeFiles.cmake
index 642d962..a94644e 100644
--- a/Modules/CheckIncludeFiles.cmake
+++ b/Modules/CheckIncludeFiles.cmake
@@ -13,7 +13,7 @@
# CMAKE_REQUIRED_INCLUDES = list of include directories
#=============================================================================
-# Copyright 2003-2009 Kitware, Inc.
+# Copyright 2003-2012 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -44,7 +44,17 @@ MACRO(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
CONFIGURE_FILE("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFiles.c" @ONLY IMMEDIATE)
- MESSAGE(STATUS "Looking for include files ${INCLUDE}")
+ SET(_INCLUDE ${INCLUDE}) # remove empty elements
+ IF("${_INCLUDE}" MATCHES "^([^;]+);.+;([^;]+)$")
+ LIST(LENGTH _INCLUDE _INCLUDE_LEN)
+ SET(_description "${_INCLUDE_LEN} include files ${CMAKE_MATCH_1}, ..., ${CMAKE_MATCH_2}")
+ ELSEIF("${_INCLUDE}" MATCHES "^([^;]+);([^;]+)$")
+ SET(_description "include files ${CMAKE_MATCH_1}, ${CMAKE_MATCH_2}")
+ ELSE()
+ SET(_description "include file ${_INCLUDE}")
+ ENDIF()
+
+ MESSAGE(STATUS "Looking for ${_description}")
TRY_COMPILE(${VARIABLE}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFiles.c
@@ -54,14 +64,14 @@ MACRO(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
"${CHECK_INCLUDE_FILES_INCLUDE_DIRS}"
OUTPUT_VARIABLE OUTPUT)
IF(${VARIABLE})
- MESSAGE(STATUS "Looking for include files ${INCLUDE} - found")
+ MESSAGE(STATUS "Looking for ${_description} - found")
SET(${VARIABLE} 1 CACHE INTERNAL "Have include ${INCLUDE}")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
"Determining if files ${INCLUDE} "
"exist passed with the following output:\n"
"${OUTPUT}\n\n")
ELSE(${VARIABLE})
- MESSAGE(STATUS "Looking for include files ${INCLUDE} - not found.")
+ MESSAGE(STATUS "Looking for ${_description} - not found.")
SET(${VARIABLE} "" CACHE INTERNAL "Have includes ${INCLUDE}")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determining if files ${INCLUDE} "