[Cmake-commits] CMake branch, master, updated. v2.8.2-380-g28edb70

[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  28edb70a9e22314da875a8fa104636461b71d8c6 (commit)
       via  e6ac0aacf6c3ce17141870e252fda77d994782d3 (commit)
      from  02e3f42a6a4bc2b94befd35c908750c10f612d44 (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=28edb70a9e22314da875a8fa104636461b71d8c6
commit 28edb70a9e22314da875a8fa104636461b71d8c6
Merge: 02e3f42 e6ac0aa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 8 11:08:05 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 8 11:08:05 2010 -0400

    Merge topic 'vs-project-groups'
    
    e6ac0aa Add FOLDER target property, for IDEs (#3796)

diff --cc CMakeLists.txt
index b318a0c,dec502b..6e8b928
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -269,21 -288,11 +295,22 @@@ MACRO (CMAKE_BUILD_UTILITIES
        "${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmbzip2")
      SET(BZIP2_LIBRARIES cmbzip2)
      ADD_SUBDIRECTORY(Utilities/cmbzip2)
+     CMAKE_SET_TARGET_FOLDER(cmbzip2 "Utilities/3rdParty")
    ENDIF()
 +
 +  #---------------------------------------------------------------------
 +  # Build or use system libarchive for CMake and CTest.
    IF(CMAKE_USE_SYSTEM_LIBARCHIVE)
 -    FIND_PACKAGE(libarchive)
 -    SET(CMAKE_TAR_LIBRARIES libarchive)
 +    IF(EXISTS ${CMAKE_ROOT}/Modules/FindLibArchive.cmake)
 +      FIND_PACKAGE(LibArchive)
 +    ELSE()
 +      CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
 +      INCLUDE(${CMake_SOURCE_DIR}/Modules/FindLibArchive.cmake)
 +    ENDIF()
 +    IF(NOT LibArchive_FOUND)
 +      MESSAGE(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBARCHIVE is ON but LibArchive is not found!")
 +    ENDIF()
 +    SET(CMAKE_TAR_LIBRARIES ${LibArchive_LIBRARIES})
    ELSE(CMAKE_USE_SYSTEM_LIBARCHIVE)
      SET(HAVE_LIBZ 1)
      SET(HAVE_ZLIB_H 1)
diff --cc Tests/ExternalProject/CMakeLists.txt
index 587cf57,00db5d4..bf90a52
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@@ -81,8 -99,8 +101,9 @@@ if(can_build_tutorial_step5
      URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
      TEST_BEFORE_INSTALL 1
 +    LOG_INSTALL 1
    )
+   set_property(TARGET ${proj} PROPERTY FOLDER "Local")
    ExternalProject_Get_Property(${proj} install_dir)
    set(TutorialStep5_install_dir ${install_dir})
  
@@@ -91,8 -109,8 +112,9 @@@
      URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
      TEST_AFTER_INSTALL 1
 +    LOG_TEST 1
    )
+   set_property(TARGET ${proj} PROPERTY FOLDER "Local")
  endif()
  
  
@@@ -108,8 -126,8 +130,9 @@@ ExternalProject_Add(${proj
    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
               -DTEST_LIST:STRING=A::B::C
    INSTALL_COMMAND ""
 +  LOG_CONFIGURE 1
  )
+ set_property(TARGET ${proj} PROPERTY FOLDER "Local/TAR")
  
  set(proj TutorialStep1-LocalNoDirTAR)
  ExternalProject_Add(${proj}
@@@ -137,8 -156,8 +161,9 @@@ ExternalProject_Add(${proj
    URL_MD5 38c648e817339c356f6be00eeed79bd0
    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
    INSTALL_COMMAND ""
 +  LOG_BUILD 1
  )
+ set_property(TARGET ${proj} PROPERTY FOLDER "Local/TGZ")
  
  set(proj TutorialStep1-LocalNoDirTGZ)
  ExternalProject_Add(${proj}
@@@ -362,8 -395,8 +401,9 @@@ if(do_svn_tests
      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
      INSTALL_COMMAND ""
      DEPENDS "SetupLocalSVNRepository"
 +    LOG_DOWNLOAD 1
    )
+   set_property(TARGET ${proj} PROPERTY FOLDER "SVN")
  endif()
  
  
@@@ -437,8 -474,8 +481,9 @@@ if(do_git_tests
      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
      INSTALL_COMMAND ""
      DEPENDS "SetupLocalGITRepository"
 +    LOG_UPDATE 1
    )
+   set_property(TARGET ${proj} PROPERTY FOLDER "GIT")
  endif()
  
  

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

Summary of changes:
 CMakeLists.txt                             |   35 ++++++++++-
 Modules/CTestTargets.cmake                 |    2 +
 Source/cmGlobalGenerator.cxx               |   40 +++++++++++
 Source/cmGlobalGenerator.h                 |    3 +
 Source/cmGlobalVisualStudio71Generator.cxx |   16 +++++
 Source/cmGlobalVisualStudio7Generator.cxx  |   99 ++++++++++++++++++++++++++++
 Source/cmGlobalVisualStudio7Generator.h    |    4 +
 Source/cmGlobalVisualStudio8Generator.cxx  |    7 ++
 Source/cmGlobalVisualStudioGenerator.cxx   |   15 ++++
 Source/cmTarget.cxx                        |   11 +++-
 Source/cmake.cxx                           |   17 +++++
 Tests/ExternalProject/CMakeLists.txt       |   45 +++++++++++++
 12 files changed, 292 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake