Disallow porcelain to populate includes and defines of IMPORTED targets.
With similar reasoning to the parent commit, as downstreams, we can't determine what $<CONFIG> generator expressions would be appropriate. Upstream would have populated the INTERFACE_INCLUDE_DIRECTORIES with config-specific generator expressions, possibly appropriate for their DEBUG_CONFIGURATIONS. In theory, if we would add include directories for a DEBUG intent, we would have to match the upstream configurations for that. Rather than attempting to discover the appropriate configurations at this time, simplify the feature instead. The use of IMPORTED targets with these commands could still be added in the future if targets would export their DEBUG_CONFIGURATIONS somehow.
This commit is contained in:
Stephen Kelly
parent
48a4cf2182
commit
b98d14d400
|
|
@ -20,13 +20,11 @@ bool cmTargetCompileDefinitionsCommand
|
|||
}
|
||||
|
||||
void cmTargetCompileDefinitionsCommand
|
||||
::HandleImportedTargetInvalidScope(const std::string &scope,
|
||||
const std::string &tgt)
|
||||
::HandleImportedTarget(const std::string &tgt)
|
||||
{
|
||||
cmOStringStream e;
|
||||
e << "Cannot specify " << scope << " compile definitions for imported "
|
||||
"target \"" << tgt << "\". Compile definitions can only be "
|
||||
"specified for an imported target in the INTERFACE mode.";
|
||||
e << "Cannot specify compile definitions for imported target \""
|
||||
<< tgt << "\".";
|
||||
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public:
|
|||
"Specify compile definitions or targets to use when compiling a given "
|
||||
"target. "
|
||||
"The named <target> must have been created by a command such as "
|
||||
"add_executable or add_library. "
|
||||
"add_executable or add_library and must not be an IMPORTED target. "
|
||||
"The INTERFACE, PUBLIC and PRIVATE keywords are required to specify "
|
||||
"the scope of the following arguments. PRIVATE and PUBLIC items will "
|
||||
"populate the COMPILE_DEFINITIONS property of <target>. PUBLIC and "
|
||||
|
|
@ -78,8 +78,7 @@ public:
|
|||
cmTypeMacro(cmTargetCompileDefinitionsCommand, cmCommand);
|
||||
|
||||
private:
|
||||
virtual void HandleImportedTargetInvalidScope(const std::string &scope,
|
||||
const std::string &tgt);
|
||||
virtual void HandleImportedTarget(const std::string &tgt);
|
||||
virtual void HandleMissingTarget(const std::string &name);
|
||||
|
||||
virtual bool HandleNonTargetArg(std::string &content,
|
||||
|
|
|
|||
|
|
@ -22,13 +22,11 @@ bool cmTargetIncludeDirectoriesCommand
|
|||
|
||||
//----------------------------------------------------------------------------
|
||||
void cmTargetIncludeDirectoriesCommand
|
||||
::HandleImportedTargetInvalidScope(const std::string &tgt,
|
||||
const std::string &scope)
|
||||
::HandleImportedTarget(const std::string &tgt)
|
||||
{
|
||||
cmOStringStream e;
|
||||
e << "Cannot specify " << scope << " include directories for imported "
|
||||
"target \"" << tgt << "\". Include directories can only be "
|
||||
"specified for an imported target in the INTERFACE mode.";
|
||||
e << "Cannot specify include directories for imported target \""
|
||||
<< tgt << "\".";
|
||||
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ public:
|
|||
"Specify include directories or targets to use when compiling a given "
|
||||
"target. "
|
||||
"The named <target> must have been created by a command such as "
|
||||
"add_executable or add_library.\n"
|
||||
"add_executable or add_library and must not be an IMPORTED target.\n"
|
||||
"If BEFORE is specified, the content will be prepended to the property "
|
||||
"instead of being appended.\n"
|
||||
"The INTERFACE, PUBLIC and PRIVATE keywords are required to specify "
|
||||
|
|
@ -82,8 +82,7 @@ public:
|
|||
cmTypeMacro(cmTargetIncludeDirectoriesCommand, cmCommand);
|
||||
|
||||
private:
|
||||
virtual void HandleImportedTargetInvalidScope(const std::string &tgt,
|
||||
const std::string &scope);
|
||||
virtual void HandleImportedTarget(const std::string &tgt);
|
||||
virtual void HandleMissingTarget(const std::string &name);
|
||||
|
||||
virtual bool HandleNonTargetArg(std::string &content,
|
||||
|
|
|
|||
|
|
@ -80,9 +80,9 @@ bool cmTargetPropCommandBase
|
|||
return false;
|
||||
}
|
||||
|
||||
if(this->Target->IsImported() && scope != "INTERFACE")
|
||||
if(this->Target->IsImported())
|
||||
{
|
||||
this->HandleImportedTargetInvalidScope(args[0], scope);
|
||||
this->HandleImportedTarget(args[0]);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,8 +32,7 @@ public:
|
|||
const char *prop, ArgumentFlags flags = NO_FLAGS);
|
||||
|
||||
private:
|
||||
virtual void HandleImportedTargetInvalidScope(const std::string &tgt,
|
||||
const std::string &scope) = 0;
|
||||
virtual void HandleImportedTarget(const std::string &tgt) = 0;
|
||||
virtual void HandleMissingTarget(const std::string &name) = 0;
|
||||
|
||||
virtual bool HandleNonTargetArg(std::string &content,
|
||||
|
|
|
|||
|
|
@ -12,11 +12,6 @@ target_compile_definitions(target_compile_definitions
|
|||
INTERFACE MY_INTERFACE_DEFINE
|
||||
)
|
||||
|
||||
add_library(importedlib UNKNOWN IMPORTED)
|
||||
target_compile_definitions(importedlib
|
||||
INTERFACE MY_IMPORTEDINTERFACE_DEFINE
|
||||
)
|
||||
|
||||
add_executable(consumer
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/consumer.cpp"
|
||||
)
|
||||
|
|
@ -24,5 +19,5 @@ add_executable(consumer
|
|||
target_compile_definitions(consumer
|
||||
PRIVATE target_compile_definitions importedlib
|
||||
$<$<TARGET_DEFINED:notdefined>:SHOULD_NOT_BE_DEFINED>
|
||||
$<$<TARGET_DEFINED:importedlib>:SHOULD_BE_DEFINED>
|
||||
$<$<TARGET_DEFINED:target_compile_definitions>:SHOULD_BE_DEFINED>
|
||||
)
|
||||
|
|
|
|||
|
|
@ -11,10 +11,6 @@
|
|||
#error Expected MY_INTERFACE_DEFINE
|
||||
#endif
|
||||
|
||||
#ifndef MY_IMPORTEDINTERFACE_DEFINE
|
||||
#error Expected MY_IMPORTEDINTERFACE_DEFINE
|
||||
#endif
|
||||
|
||||
#ifdef SHOULD_NOT_BE_DEFINED
|
||||
#error Unexpected SHOULD_NOT_BE_DEFINED
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -11,9 +11,6 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/publicinclude/publicinclude.h" "#define
|
|||
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/interfaceinclude")
|
||||
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/interfaceinclude/interfaceinclude.h" "#define INTERFACEINCLUDE_DEFINE\n")
|
||||
|
||||
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/importedinterfaceinclude")
|
||||
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/importedinterfaceinclude/importedinterfaceinclude.h" "#define IMPORTEDINTERFACEINCLUDE_DEFINE\n")
|
||||
|
||||
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/poison")
|
||||
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/poison/common.h" "#error Should not be included\n")
|
||||
|
||||
|
|
@ -36,15 +33,10 @@ target_include_directories(target_include_directories
|
|||
BEFORE PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/cure"
|
||||
)
|
||||
|
||||
add_library(importedlib UNKNOWN IMPORTED)
|
||||
target_include_directories(importedlib
|
||||
INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/importedinterfaceinclude"
|
||||
)
|
||||
|
||||
add_executable(consumer
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/consumer.cpp"
|
||||
)
|
||||
|
||||
target_include_directories(consumer
|
||||
PRIVATE target_include_directories importedlib
|
||||
PRIVATE target_include_directories
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
#include "common.h"
|
||||
#include "publicinclude.h"
|
||||
#include "interfaceinclude.h"
|
||||
#include "importedinterfaceinclude.h"
|
||||
|
||||
#ifdef PRIVATEINCLUDE_DEFINE
|
||||
#error Unexpected PRIVATEINCLUDE_DEFINE
|
||||
|
|
@ -16,10 +15,6 @@
|
|||
#error Expected INTERFACEINCLUDE_DEFINE
|
||||
#endif
|
||||
|
||||
#ifndef IMPORTEDINTERFACEINCLUDE_DEFINE
|
||||
#error Expected IMPORTEDINTERFACEINCLUDE_DEFINE
|
||||
#endif
|
||||
|
||||
#ifndef CURE_DEFINE
|
||||
#error Expected CURE_DEFINE
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue