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

set_property: Fix crash when setting LINK_LIBRARIES to nothing

Browse Source 
We use a special dedicated structure to store the LINK_LIBRARIES target
property.  Do not try to construct a string from a NULL value.  Instead
leave the property structure empty when no value is given.

Reported-by: Ghyslain Leclerc <ghleclerc@gmail.com>
This commit is contained in:
Brad King 2015-07-08 13:14:37 -04:00
parent a6916a6c6e
commit 7aa9e80e35
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmTarget.cxx
View File

@ -1748,9 +1748,12 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
else if (prop == "LINK_LIBRARIES") else if (prop == "LINK_LIBRARIES")
{ {
this->Internal->LinkImplementationPropertyEntries.clear(); this->Internal->LinkImplementationPropertyEntries.clear();
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace(); if (value)
cmValueWithOrigin entry(value, lfbt); {
this->Internal->LinkImplementationPropertyEntries.push_back(entry); cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
cmValueWithOrigin entry(value, lfbt);
this->Internal->LinkImplementationPropertyEntries.push_back(entry);
}
} }
else if (prop == "SOURCES") else if (prop == "SOURCES")
{ {
@ -1834,9 +1837,12 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
} }
else if (prop == "LINK_LIBRARIES") else if (prop == "LINK_LIBRARIES")
{ {
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace(); if (value)
cmValueWithOrigin entry(value, lfbt); {
this->Internal->LinkImplementationPropertyEntries.push_back(entry); cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
cmValueWithOrigin entry(value, lfbt);
this->Internal->LinkImplementationPropertyEntries.push_back(entry);
}
} }
else if (prop == "SOURCES") else if (prop == "SOURCES")
{ {

1
Tests/RunCMake/CMakeLists.txt
View File

@ -146,6 +146,7 @@ add_RunCMake_test(list)
add_RunCMake_test(message) add_RunCMake_test(message)
add_RunCMake_test(project) add_RunCMake_test(project)
add_RunCMake_test(return) add_RunCMake_test(return)
add_RunCMake_test(set_property)
add_RunCMake_test(string) add_RunCMake_test(string)
add_RunCMake_test(try_compile) add_RunCMake_test(try_compile)
add_RunCMake_test(try_run) add_RunCMake_test(try_run)

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

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

7
Tests/RunCMake/set_property/LINK_LIBRARIES.cmake Normal file
View File

@ -0,0 +1,7 @@
add_custom_target(CustomTarget)
set_property(TARGET CustomTarget PROPERTY LINK_LIBRARIES)
set_property(TARGET CustomTarget APPEND PROPERTY LINK_LIBRARIES)
get_property(val TARGET CustomTarget PROPERTY LINK_LIBRARIES)
if (NOT "${val}" STREQUAL "")
message(FATAL_ERROR "LINK_LIBRARIES value is '${val}' but should be ''")
endif()

3
Tests/RunCMake/set_property/RunCMakeTest.cmake Normal file
View File

@ -0,0 +1,3 @@
include(RunCMake)
run_cmake(LINK_LIBRARIES)