kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'deprecation-message' 

f973737 GenerateExportHeader: Port to use message(DEPRECATION)
f69606d Qt4Macros: Port to use message(DEPRECATION)
509c142 message: Add a DEPRECATION mode
This commit is contained in:
Brad King 2013-10-09 10:24:16 -04:00 committed by CMake Topic Stage
parent f33068f615 f973737305
commit be9d289fce
20 changed files with 70 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/GenerateExportHeader.cmake
View File

@ -337,15 +337,7 @@ endfunction()
function(add_compiler_export_flags)
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
if(CMAKE_WARN_DEPRECATED)
set(messageType WARNING)
endif()
if(CMAKE_ERROR_DEPRECATED)
set(messageType FATAL_ERROR)
endif()
if(messageType)
message(${messageType} "The add_compiler_export_flags function is obsolete. Use the CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN target properties instead.")
endif()
message(DEPRECATION "The add_compiler_export_flags function is obsolete. Use the CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN target properties instead.")
endif()
_test_compiler_hidden_visibility()

20
Modules/Qt4Macros.cmake
View File

@ -355,15 +355,7 @@ endmacro()
macro(QT4_AUTOMOC)
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
if(CMAKE_WARN_DEPRECATED)
set(messageType WARNING)
endif()
if(CMAKE_ERROR_DEPRECATED)
set(messageType FATAL_ERROR)
endif()
if(messageType)
message(${messageType} "The qt4_automoc macro is obsolete. Use the CMAKE_AUTOMOC feature instead.")
endif()
message(DEPRECATION "The qt4_automoc macro is obsolete. Use the CMAKE_AUTOMOC feature instead.")
endif()
QT4_GET_MOC_FLAGS(_moc_INCS)
@ -476,15 +468,7 @@ endmacro()
function(qt4_use_modules _target _link_type)
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
if(CMAKE_WARN_DEPRECATED)
set(messageType WARNING)
endif()
if(CMAKE_ERROR_DEPRECATED)
set(messageType FATAL_ERROR)
endif()
if(messageType)
message(${messageType} "The qt4_use_modules function is obsolete. Use target_link_libraries with IMPORTED targets instead.")
endif()
message(DEPRECATION "The qt4_use_modules function is obsolete. Use target_link_libraries with IMPORTED targets instead.")
endif()
if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE")
set(modules ${ARGN})

17
Source/cmMessageCommand.cxx
View File

@ -52,6 +52,23 @@ bool cmMessageCommand
status = true;
++i;
}
else if (*i == "DEPRECATION")
{
if (this->Makefile->IsOn("CMAKE_ERROR_DEPRECATED"))
{
fatal = true;
type = cmake::DEPRECATION_ERROR;
}
else if (this->Makefile->IsOn("CMAKE_WARN_DEPRECATED"))
{
type = cmake::DEPRECATION_WARNING;
}
else
{
return true;
}
++i;
}
for(;i != args.end(); ++i)
{

8
Source/cmMessageCommand.h
View File

@ -60,9 +60,8 @@ public:
virtual const char* GetFullDocumentation() const
{
return
" message([STATUS|WARNING|AUTHOR_WARNING|FATAL_ERROR|SEND_ERROR]\n"
" \"message to display\" ...)\n"
"The optional keyword determines the type of message:\n"
" message([<mode>] \"message to display\" ...)\n"
"The optional <mode> keyword determines the type of message:\n"
" (none) = Important information\n"
" STATUS = Incidental information\n"
" WARNING = CMake Warning, continue processing\n"
@ -70,6 +69,9 @@ public:
" SEND_ERROR = CMake Error, continue processing,\n"
" but skip generation\n"
" FATAL_ERROR = CMake Error, stop processing and generation\n"
" DEPRECATION = CMake Deprecation Error or Warning if variable\n"
" CMAKE_ERROR_DEPRECATED or CMAKE_WARN_DEPRECATED\n"
" is enabled, respectively, else no message.\n"
"The CMake command-line tool displays STATUS messages on stdout "
"and all other message types on stderr. "
"The CMake GUI displays all messages in its log area. "

9
Source/cmake.cxx
View File

@ -3127,6 +3127,15 @@ void cmake::IssueMessage(cmake::MessageType t, std::string const& text,
{
msg << "CMake Debug Log";
}
else if(t == cmake::DEPRECATION_ERROR)
{
msg << "CMake Deprecation Error";
isError = true;
}
else if (t == cmake::DEPRECATION_WARNING)
{
msg << "CMake Deprecation Warning";
}
else
{
msg << "CMake Warning";

4
Source/cmake.h
View File

@ -65,7 +65,9 @@ class cmake
INTERNAL_ERROR,
MESSAGE,
WARNING,
LOG
LOG,
DEPRECATION_ERROR,
DEPRECATION_WARNING
};

1
Tests/RunCMake/CMakeLists.txt
View File

@ -95,6 +95,7 @@ add_RunCMake_test(if)
add_RunCMake_test(include)
add_RunCMake_test(include_directories)
add_RunCMake_test(list)
add_RunCMake_test(message)
add_RunCMake_test(try_compile)
add_RunCMake_test(variable_watch)
add_RunCMake_test(CMP0004)

2
Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
View File

@ -1,4 +1,4 @@
CMake Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
CMake Deprecation Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
The qt4_automoc macro is obsolete. Use the CMAKE_AUTOMOC feature instead.
Call Stack \(most recent call first\):
AutomocMacro-WARN.cmake:7 \(qt4_automoc\)

2
Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
View File

@ -1,4 +1,4 @@
CMake Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
CMake Deprecation Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
The qt4_use_modules function is obsolete. Use target_link_libraries with
IMPORTED targets instead.
Call Stack \(most recent call first\):

3
Tests/RunCMake/message/CMakeLists.txt Normal file
View File

@ -0,0 +1,3 @@
cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} NONE)
include(${RunCMake_TEST}.cmake)

5
Tests/RunCMake/message/RunCMakeTest.cmake Normal file
View File

@ -0,0 +1,5 @@
include(RunCMake)
run_cmake(nomessage)
run_cmake(warnmessage)
run_cmake(errormessage)

1
Tests/RunCMake/message/errormessage-result.txt Normal file
View File

@ -0,0 +1 @@
1

4
Tests/RunCMake/message/errormessage-stderr.txt Normal file
View File

@ -0,0 +1,4 @@
CMake Deprecation Error at errormessage.cmake:4 \(message\):
This is an error
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)

4
Tests/RunCMake/message/errormessage.cmake Normal file
View File

@ -0,0 +1,4 @@
set(CMAKE_ERROR_DEPRECATED ON)
message(DEPRECATION "This is an error")

1
Tests/RunCMake/message/nomessage-result.txt Normal file
View File

@ -0,0 +1 @@
0

1
Tests/RunCMake/message/nomessage-stderr.txt Normal file
View File

@ -0,0 +1 @@
^$

2
Tests/RunCMake/message/nomessage.cmake Normal file
View File

@ -0,0 +1,2 @@
message(DEPRECATION "This is not issued")

1
Tests/RunCMake/message/warnmessage-result.txt Normal file
View File

@ -0,0 +1 @@
0

4
Tests/RunCMake/message/warnmessage-stderr.txt Normal file
View File

@ -0,0 +1,4 @@
CMake Deprecation Warning at warnmessage.cmake:4 \(message\):
This is a warning
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)

4
Tests/RunCMake/message/warnmessage.cmake Normal file
View File

@ -0,0 +1,4 @@
set(CMAKE_WARN_DEPRECATED ON)
message(DEPRECATION "This is a warning")