summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-01-20 12:07:31 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-01-21 08:12:22 (GMT)
commit6063fef226d35aad0629d7098f72afa650e7a149 (patch)
tree853f68935bb251cb805c063cbbfea2d5a5dda8a9
parentaa6674831c3ea3bf3cca7c9f667d2e5c75873a3d (diff)
downloadCMake-6063fef226d35aad0629d7098f72afa650e7a149.zip
CMake-6063fef226d35aad0629d7098f72afa650e7a149.tar.gz
CMake-6063fef226d35aad0629d7098f72afa650e7a149.tar.bz2
Output include directories as LOG messages, not warnings.
-rw-r--r--Source/cmake.cxx4
-rw-r--r--Tests/RunCMake/include_directories/DebugIncludes-stderr.txt8
2 files changed, 8 insertions, 4 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 2eecfba..932c996 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -4394,6 +4394,10 @@ void cmake::IssueMessage(cmake::MessageType t, std::string const& text,
isError = true;
msg << "CMake Internal Error (please report a bug)";
}
+ else if(t == cmake::LOG)
+ {
+ msg << "CMake Debug Log";
+ }
else
{
msg << "CMake Warning";
diff --git a/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt b/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
index 379174a..736fe69 100644
--- a/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
+++ b/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
@@ -1,4 +1,4 @@
-CMake Warning at DebugIncludes.cmake:8 \(include_directories\):
+CMake Debug Log at DebugIncludes.cmake:8 \(include_directories\):
Used includes for target lll:
\* .*/Tests/RunCMake/include_directories/one
@@ -7,7 +7,7 @@ CMake Warning at DebugIncludes.cmake:8 \(include_directories\):
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
+
-CMake Warning at DebugIncludes.cmake:13 \(set_property\):
+CMake Debug Log at DebugIncludes.cmake:13 \(set_property\):
Used includes for target lll:
\* .*/Tests/RunCMake/include_directories/three
@@ -15,7 +15,7 @@ CMake Warning at DebugIncludes.cmake:13 \(set_property\):
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
+
-CMake Warning at DebugIncludes.cmake:18 \(include_directories\):
+CMake Debug Log at DebugIncludes.cmake:18 \(include_directories\):
Used includes for target lll:
\* .*/Tests/RunCMake/include_directories/four
@@ -23,7 +23,7 @@ CMake Warning at DebugIncludes.cmake:18 \(include_directories\):
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
+
-CMake Warning at DebugIncludes.cmake:25 \(set_property\):
+CMake Debug Log at DebugIncludes.cmake:25 \(set_property\):
Used includes for target lll:
\* .*/Tests/RunCMake/include_directories/five