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

Fix OLD behavior of CMP0021.

Browse Source 
Exclude Ninja and Xcode from the CMP0021 test

They do not behave the same as the makefile generator with
relative paths.

Don't overwrite the header file for in-source builds.
This commit is contained in:
Stephen Kelly 2013-08-22 23:52:00 +02:00
parent 374af6529a
commit eef6df5c7d
5 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmTarget.cxx
View File

@ -3303,7 +3303,10 @@ static void processIncludeDirectories(cmTarget *tgt,
if (!noMessage)
{
tgt->GetMakefile()->IssueMessage(messageType, e.str().c_str());
return;
if (messageType == cmake::FATAL_ERROR)
{
return;
}
}
}

14
Tests/IncludeDirectories/CMP0021/CMakeLists.txt Normal file
View File

@ -0,0 +1,14 @@
cmake_policy(SET CMP0021 OLD)
add_executable(cmp0021exe main.cpp)
if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/includes")
execute_process(COMMAND ${CMAKE_COMMAND} -E
copy_directory
"${CMAKE_CURRENT_SOURCE_DIR}/includes"
"${CMAKE_CURRENT_BINARY_DIR}/includes"
)
endif()
set_property(TARGET cmp0021exe PROPERTY
INCLUDE_DIRECTORIES includes/cmp0021)

2
Tests/IncludeDirectories/CMP0021/includes/cmp0021/cmp0021.h Normal file
View File

@ -0,0 +1,2 @@
#define CMP0021_DEFINE

11
Tests/IncludeDirectories/CMP0021/main.cpp Normal file
View File

@ -0,0 +1,11 @@
#include "cmp0021.h"
#ifndef CMP0021_DEFINE
#error Expected CMP0021_DEFINE
#endif
int main(int, char **)
{
return 0;
}

4
Tests/IncludeDirectories/CMakeLists.txt
View File

@ -86,3 +86,7 @@ get_target_property(incs empty_entry_test INCLUDE_DIRECTORIES)
if (NOT incs STREQUAL ";/one/two")
message(SEND_ERROR "Empty include_directories entry was not ignored.")
endif()
if(NOT CMAKE_GENERATOR STREQUAL Xcode AND NOT CMAKE_GENERATOR STREQUAL Ninja)
add_subdirectory(CMP0021)
endif()