[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2194-g74b4690

[Stephen Kelly]

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, next has been updated
       via  74b4690a288f807e063e39a71e2404248503aef8 (commit)
       via  a96e1aecc302509e1d69fad8d12685ca834ca85e (commit)
       via  72d207b30f2d43644b65c58548f4bc681e975903 (commit)
       via  03a92116ba6a5a585014d4d6e5ea9edcfb1a0a49 (commit)
      from  6bb5632ed61cac314fe81da4a90f867b38db3bf4 (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=74b4690a288f807e063e39a71e2404248503aef8
commit 74b4690a288f807e063e39a71e2404248503aef8
Merge: 6bb5632 a96e1ae
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 19 11:32:42 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 19 11:32:42 2013 -0500

    Merge topic 'try_compile-targets' into next
    
    a96e1ae Treat non-imported targets as library names.
    72d207b Revert "Only find BZip2 if we're not using cmbzip2."
    03a9211 Revert "Create a clean environment to invoke find_package(BZip2)"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a96e1aecc302509e1d69fad8d12685ca834ca85e
commit a96e1aecc302509e1d69fad8d12685ca834ca85e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 19 17:27:25 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 19 17:27:25 2013 +0100

    Treat non-imported targets as library names.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 2e9b8f5..beb4963 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -135,11 +135,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
         }
         if (!tgt->IsImported())
           {
-          this->Makefile->IssueMessage(cmake::FATAL_ERROR,
-            "Only libraries may be used as try_compile IMPORTED "
-            "LINK_LIBRARIES.  Got " + std::string(tgt->GetName()) + ", which "
-            "is a non-IMPORTED target.");
-          return -1;
+          continue;
           }
         targets.push_back(tgt);
         }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72d207b30f2d43644b65c58548f4bc681e975903
commit 72d207b30f2d43644b65c58548f4bc681e975903
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 19 17:22:09 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 19 17:22:09 2013 +0100

    Revert "Only find BZip2 if we're not using cmbzip2."
    
    This reverts commit e03ff536ded3fd36bbbe5367129309ff5602dde0.

diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index c125339..ebf28ae 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -186,9 +186,7 @@ ENDIF(ZLIB_FOUND)
 #
 # Find BZip2
 #
-IF("${BZIP2_LIBRARIES}" STREQUAL "")
-  FIND_PACKAGE(BZip2)
-ENDIF()
+FIND_PACKAGE(BZip2)
 IF(BZIP2_FOUND)
   SET(HAVE_LIBBZ2 1)
   SET(HAVE_BZLIB_H 1)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03a92116ba6a5a585014d4d6e5ea9edcfb1a0a49
commit 03a92116ba6a5a585014d4d6e5ea9edcfb1a0a49
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 19 17:22:05 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 19 17:22:05 2013 +0100

    Revert "Create a clean environment to invoke find_package(BZip2)"
    
    This reverts commit 174be33091457332dd2fc42c905d0de029f54257.

diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 7427933..c125339 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -186,11 +186,8 @@ ENDIF(ZLIB_FOUND)
 #
 # Find BZip2
 #
-SET(BZIP2_LIBRARIES_BACKUP "${BZIP2_LIBRARIES}")
-UNSET(BZIP2_LIBRARIES)
-FIND_PACKAGE(BZip2)
-IF(NOT "${BZIP2_LIBRARIES_BACKUP}" STREQUAL "")
-  SET(BZIP2_LIBRARIES "${BZIP2_LIBRARIES_BACKUP}")
+IF("${BZIP2_LIBRARIES}" STREQUAL "")
+  FIND_PACKAGE(BZip2)
 ENDIF()
 IF(BZIP2_FOUND)
   SET(HAVE_LIBBZ2 1)

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

Summary of changes:
 Source/cmCoreTryCompile.cxx           |    6 +-----
 Utilities/cmlibarchive/CMakeLists.txt |    5 -----
 2 files changed, 1 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake