diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-02-23 12:30:38 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-02-25 14:35:11 (GMT) |
| commit | cbf07569ed0a1e64b7131ba989c2cc16f1e3c16f (patch) | |
| tree | ac4a89f92dd315a9f375c23cad5bb1d1d4538323 /Tests/CMakeCommands/target_compile_definitions | |
| parent | 21a342c8b16df2cc9ea34ef494ba8ffd7f3a450a (diff) | |
| download | CMake-cbf07569ed0a1e64b7131ba989c2cc16f1e3c16f.zip CMake-cbf07569ed0a1e64b7131ba989c2cc16f1e3c16f.tar.gz CMake-cbf07569ed0a1e64b7131ba989c2cc16f1e3c16f.tar.bz2 | |
Revert "Add the TARGET_DEFINED generator expression"
This reverts commit 2bee6f5ba5b3f33817cc00e056a7df60d05c9399.
This expression is not used, and has a semantic which is not completely
optimal (namely considering utility targets to be targets, though
usually we are interested in linkable targets).
Remove it so that we have more freedom to define better expressions in
the future.
Conflicts:
Source/cmGeneratorExpressionEvaluator.cxx
Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt
Tests/CMakeCommands/target_compile_definitions/consumer.cpp
Diffstat (limited to 'Tests/CMakeCommands/target_compile_definitions')
| -rw-r--r-- | Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CMakeCommands/target_compile_definitions/consumer.cpp | 8 |
2 files changed, 0 insertions, 10 deletions
diff --git a/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt b/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt index 8a4437b..6d0e646 100644 --- a/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt +++ b/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt @@ -18,7 +18,5 @@ add_executable(consumer target_compile_definitions(consumer PRIVATE $<TARGET_PROPERTY:target_compile_definitions,INTERFACE_COMPILE_DEFINITIONS> - $<$<TARGET_DEFINED:notdefined>:SHOULD_NOT_BE_DEFINED> - $<$<TARGET_DEFINED:target_compile_definitions>:SHOULD_BE_DEFINED> -DDASH_D_DEFINE ) diff --git a/Tests/CMakeCommands/target_compile_definitions/consumer.cpp b/Tests/CMakeCommands/target_compile_definitions/consumer.cpp index 1a46aa5..a391114 100644 --- a/Tests/CMakeCommands/target_compile_definitions/consumer.cpp +++ b/Tests/CMakeCommands/target_compile_definitions/consumer.cpp @@ -11,14 +11,6 @@ #error Expected MY_INTERFACE_DEFINE #endif -#ifdef SHOULD_NOT_BE_DEFINED -#error Unexpected SHOULD_NOT_BE_DEFINED -#endif - -#ifndef SHOULD_BE_DEFINED -#error Expected SHOULD_BE_DEFINED -#endif - #ifndef DASH_D_DEFINE #error Expected DASH_D_DEFINE #endif |