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

Merge topic 'consistent-genex-target-message' 

fb2fa476 Genex: Clarify error message on use with non-binary targets (#14899).
This commit is contained in:
Brad King 2014-05-30 14:51:41 -04:00 committed by CMake Topic Stage
parent c4a26b70cb fb2fa47656
commit 060c86a506
20 changed files with 130 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/cmGeneratorExpressionEvaluator.cxx
View File

@ -457,8 +457,8 @@ static const struct CCompilerIdNode : public CompilerIdNode
if (!context->HeadTarget)
{
reportError(context, content->GetOriginalExpression(),
"$<C_COMPILER_ID> may only be used with targets. It may not "
"be used with add_custom_command.");
"$<C_COMPILER_ID> may only be used with binary targets. It may "
"not be used with add_custom_command or add_custom_target.");
return std::string();
}
return this->EvaluateWithLanguage(parameters, context, content,
@ -479,8 +479,8 @@ static const struct CXXCompilerIdNode : public CompilerIdNode
if (!context->HeadTarget)
{
reportError(context, content->GetOriginalExpression(),
"$<CXX_COMPILER_ID> may only be used with targets. It may not "
"be used with add_custom_command.");
"$<CXX_COMPILER_ID> may only be used with binary targets. It may "
"not be used with add_custom_command or add_custom_target.");
return std::string();
}
return this->EvaluateWithLanguage(parameters, context, content,
@ -541,8 +541,8 @@ static const struct CCompilerVersionNode : public CompilerVersionNode
if (!context->HeadTarget)
{
reportError(context, content->GetOriginalExpression(),
"$<C_COMPILER_VERSION> may only be used with targets. It may not "
"be used with add_custom_command.");
"$<C_COMPILER_VERSION> may only be used with binary targets. It "
"may not be used with add_custom_command or add_custom_target.");
return std::string();
}
return this->EvaluateWithLanguage(parameters, context, content,
@ -563,8 +563,8 @@ static const struct CxxCompilerVersionNode : public CompilerVersionNode
if (!context->HeadTarget)
{
reportError(context, content->GetOriginalExpression(),
"$<CXX_COMPILER_VERSION> may only be used with targets. It may "
"not be used with add_custom_command.");
"$<CXX_COMPILER_VERSION> may only be used with binary targets. It "
"may not be used with add_custom_command or add_custom_target.");
return std::string();
}
return this->EvaluateWithLanguage(parameters, context, content,
@ -893,10 +893,10 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
if (!target && parameters.size() == 1)
{
reportError(context, content->GetOriginalExpression(),
"$<TARGET_PROPERTY:prop> may only be used with targets. It may not "
"be used with add_custom_command. Specify the target to read a "
"property from using the $<TARGET_PROPERTY:tgt,prop> signature "
"instead.");
"$<TARGET_PROPERTY:prop> may only be used with binary targets. "
"It may not be used with add_custom_command or add_custom_target. "
"Specify the target to read a property from using the "
"$<TARGET_PROPERTY:tgt,prop> signature instead.");
return std::string();
}
@ -1460,8 +1460,8 @@ static const struct TargetPolicyNode : public cmGeneratorExpressionNode
if (!context->HeadTarget)
{
reportError(context, content->GetOriginalExpression(),
"$<TARGET_POLICY:prop> may only be used with targets. It may not "
"be used with add_custom_command.");
"$<TARGET_POLICY:prop> may only be used with binary targets. It "
"may not be used with add_custom_command or add_custom_target.");
return std::string();
}

1
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_ID-result.txt Normal file
View File

@ -0,0 +1 @@
1

9
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_ID-stderr.txt Normal file
View File

@ -0,0 +1,9 @@
CMake Error at NonValidTarget-CXX_COMPILER_ID.cmake:4 \(add_custom_command\):
Error evaluating generator expression:
\$<CXX_COMPILER_ID>
\$<CXX_COMPILER_ID> may only be used with binary targets. It may not be
used with add_custom_command or add_custom_target.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)

8
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_ID.cmake Normal file
View File

@ -0,0 +1,8 @@
enable_language(CXX)
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp"
COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<CXX_COMPILER_ID>.cpp"
)
add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")

1
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_VERSION-result.txt Normal file
View File

@ -0,0 +1 @@
1

9
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_VERSION-stderr.txt Normal file
View File

@ -0,0 +1,9 @@
CMake Error at NonValidTarget-CXX_COMPILER_VERSION.cmake:4 \(add_custom_command\):
Error evaluating generator expression:
\$<CXX_COMPILER_VERSION>
\$<CXX_COMPILER_VERSION> may only be used with binary targets. It may not
be used with add_custom_command or add_custom_target.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)

8
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_VERSION.cmake Normal file
View File

@ -0,0 +1,8 @@
enable_language(CXX)
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp"
COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<CXX_COMPILER_VERSION>.cpp"
)
add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")

1
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_ID-result.txt Normal file
View File

@ -0,0 +1 @@
1

9
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_ID-stderr.txt Normal file
View File

@ -0,0 +1,9 @@
CMake Error at NonValidTarget-C_COMPILER_ID.cmake:4 \(add_custom_command\):
Error evaluating generator expression:
\$<C_COMPILER_ID>
\$<C_COMPILER_ID> may only be used with binary targets. It may not be used
with add_custom_command or add_custom_target.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)

8
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_ID.cmake Normal file
View File

@ -0,0 +1,8 @@
enable_language(CXX)
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp"
COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<C_COMPILER_ID>.cpp"
)
add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")

1
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_VERSION-result.txt Normal file
View File

@ -0,0 +1 @@
1

9
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_VERSION-stderr.txt Normal file
View File

@ -0,0 +1,9 @@
CMake Error at NonValidTarget-C_COMPILER_VERSION.cmake:4 \(add_custom_command\):
Error evaluating generator expression:
\$<C_COMPILER_VERSION>
\$<C_COMPILER_VERSION> may only be used with binary targets. It may not be
used with add_custom_command or add_custom_target.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)

8
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_VERSION.cmake Normal file
View File

@ -0,0 +1,8 @@
enable_language(CXX)
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp"
COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<C_COMPILER_VERSION>.cpp"
)
add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")

1
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_POLICY-result.txt Normal file
View File

@ -0,0 +1 @@
1

9
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_POLICY-stderr.txt Normal file
View File

@ -0,0 +1,9 @@
CMake Error at NonValidTarget-TARGET_POLICY.cmake:4 \(add_custom_command\):
Error evaluating generator expression:
\$<TARGET_POLICY:CMP0004>
\$<TARGET_POLICY:prop> may only be used with binary targets. It may not be
used with add_custom_command or add_custom_target.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)

8
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_POLICY.cmake Normal file
View File

@ -0,0 +1,8 @@
enable_language(CXX)
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp"
COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<TARGET_POLICY:CMP0004>.cpp"
)
add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")

1
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_PROPERTY-result.txt Normal file
View File

@ -0,0 +1 @@
1

11
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_PROPERTY-stderr.txt Normal file
View File

@ -0,0 +1,11 @@
CMake Error at NonValidTarget-TARGET_PROPERTY.cmake:4 \(add_custom_command\):
Error evaluating generator expression:
\$<TARGET_PROPERTY:NotAProperty>
\$<TARGET_PROPERTY:prop> may only be used with binary targets. It may not
be used with add_custom_command or add_custom_target. Specify the target
to read a property from using the \$<TARGET_PROPERTY:tgt,prop> signature
instead.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)

8
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_PROPERTY.cmake Normal file
View File

@ -0,0 +1,8 @@
enable_language(CXX)
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp"
COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file$<TARGET_PROPERTY:NotAProperty>.cpp"
)
add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file.cpp")

6
Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
View File

@ -10,3 +10,9 @@ run_cmake(BadTargetName)
run_cmake(BadTargetTypeObject)
run_cmake(BadInstallPrefix)
run_cmake(CMP0044-WARN)
run_cmake(NonValidTarget-C_COMPILER_ID)
run_cmake(NonValidTarget-CXX_COMPILER_ID)
run_cmake(NonValidTarget-C_COMPILER_VERSION)
run_cmake(NonValidTarget-CXX_COMPILER_VERSION)
run_cmake(NonValidTarget-TARGET_PROPERTY)
run_cmake(NonValidTarget-TARGET_POLICY)