[Cmake-commits] CMake branch, master, updated. v2.8.10.2-513-g76ace2b

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  76ace2b95aba4b12c049224aa8a2d18c67129d45 (commit)
       via  b98d14d40016efee420bee26b9795880fdf6a5f8 (commit)
       via  48a4cf21825c9ed5f53ac25d5f4577baaf92d1f7 (commit)
      from  7db963a01789f50f6c3bf111a63dcab09b9a88cd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76ace2b95aba4b12c049224aa8a2d18c67129d45
commit 76ace2b95aba4b12c049224aa8a2d18c67129d45
Merge: 7db963a b98d14d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 23 15:11:40 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 23 15:11:40 2013 -0500

    Merge topic 'disallow-IMPORTED-interface-porcelain'
    
    b98d14d Disallow porcelain to populate includes and defines of IMPORTED targets.
    48a4cf2 Revert "Allow target_link_libraries with IMPORTED targets."

diff --cc Tests/CMakeCommands/target_include_directories/CMakeLists.txt
index 8fa2eae,486bca0..e190161
--- a/Tests/CMakeCommands/target_include_directories/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_include_directories/CMakeLists.txt
@@@ -33,19 -30,9 +30,14 @@@ target_include_directories(target_inclu
    PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/poison"
  )
  target_include_directories(target_include_directories
 -  BEFORE PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/cure"
 +  BEFORE PUBLIC "$<$<TARGET_DEFINED:target_include_directories>:${CMAKE_CURRENT_BINARY_DIR}/cure>"
 +)
 +
 +# Has no effect because the target is not defined:
 +target_include_directories(target_include_directories
 +  BEFORE PUBLIC "$<$<TARGET_DEFINED:notdefined>:${CMAKE_CURRENT_BINARY_DIR}/poison>"
  )
  
- add_library(importedlib UNKNOWN IMPORTED)
- target_include_directories(importedlib
-   INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/importedinterfaceinclude"
- )
- 
  add_executable(consumer
    "${CMAKE_CURRENT_SOURCE_DIR}/consumer.cpp"
  )

-----------------------------------------------------------------------

Summary of changes:
 Source/cmTargetCompileDefinitionsCommand.cxx       |    8 +++-----
 Source/cmTargetCompileDefinitionsCommand.h         |    5 ++---
 Source/cmTargetIncludeDirectoriesCommand.cxx       |    8 +++-----
 Source/cmTargetIncludeDirectoriesCommand.h         |    5 ++---
 Source/cmTargetLinkLibrariesCommand.cxx            |   14 --------------
 Source/cmTargetPropCommandBase.cxx                 |    4 ++--
 Source/cmTargetPropCommandBase.h                   |    3 +--
 .../target_compile_definitions/CMakeLists.txt      |    7 +------
 .../target_compile_definitions/consumer.cpp        |    4 ----
 .../target_include_directories/CMakeLists.txt      |   10 +---------
 .../target_include_directories/consumer.cpp        |    5 -----
 .../target_link_libraries/CMakeLists.txt           |    3 ---
 12 files changed, 15 insertions(+), 61 deletions(-)


hooks/post-receive
-- 
CMake