[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6030-g243a6f5

[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  243a6f54d793e3b8655d8da7f862dfe9e09e30a7 (commit)
       via  d670a8e5436bab3da7a0c71a8661ebce8fe90eb1 (commit)
       via  259bf0918cfbfbbeaf9078001c0b1010066666a1 (commit)
      from  138a571f2f2f33948bdfa9f4acf75e16956d10f7 (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=243a6f54d793e3b8655d8da7f862dfe9e09e30a7
commit 243a6f54d793e3b8655d8da7f862dfe9e09e30a7
Merge: 138a571 d670a8e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 4 07:50:02 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 4 07:50:02 2013 -0500

    Merge topic 'minor-cleanups' into next
    
    d670a8e Tests: Add diagnostic to ExportImport test.
    259bf09 Make the cmStrictTargetComparison operate on const cmTarget*.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d670a8e5436bab3da7a0c71a8661ebce8fe90eb1
commit d670a8e5436bab3da7a0c71a8661ebce8fe90eb1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 4 13:48:27 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Dec 4 13:48:27 2013 +0100

    Tests: Add diagnostic to ExportImport test.
    
    The error message is otherwise confusing:
    
     $ make
     makeobj[0]: Entering directory `/home/stephen/dev/src/cmake/Tests/ExportImport/build'
     [ 25%] Generating CleanupProject
     [ 25%] Built target CleanupTarget
     [ 50%] Generating ExportProject
     loading initial cache file /home/stephen/dev/src/cmake/Tests/ExportImport/build/InitialCache.cmake
     Internal cmake changing into directory: /home/stephen/dev/src/cmake/Tests/ExportImport/build/Export
     Error: cmake execution failed
     CMake Error: CMake was unable to find a build program corresponding to "Unix Makefiles".  CMAKE_MAKE_PROGRAM is not set.  You probably need to select a different build tool.
     CMake Error: Error required internal CMake variable not set, cmake may be not be built correctly.

diff --git a/Tests/ExportImport/CMakeLists.txt b/Tests/ExportImport/CMakeLists.txt
index 8be8d33..f79be19 100644
--- a/Tests/ExportImport/CMakeLists.txt
+++ b/Tests/ExportImport/CMakeLists.txt
@@ -1,6 +1,10 @@
 cmake_minimum_required (VERSION 2.7.20090711)
 project(ExportImport C CXX)
 
+if (NOT CMAKE_TEST_MAKEPROGRAM)
+  message(FATAL_ERROR "You must set CMAKE_TEST_MAKEPROGRAM when running this test")
+endif()
+
 # Wipe out the install tree to make sure the exporter works.
 add_custom_command(
   OUTPUT ${ExportImport_BINARY_DIR}/CleanupProject

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=259bf0918cfbfbbeaf9078001c0b1010066666a1
commit 259bf0918cfbfbbeaf9078001c0b1010066666a1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 4 13:35:39 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Dec 4 13:43:30 2013 +0100

    Make the cmStrictTargetComparison operate on const cmTarget*.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 5a535c7..fdd4e6d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -693,7 +693,8 @@ void cmGeneratorTarget::GenerateTargetManifest(const char* config) const
     }
 }
 
-bool cmStrictTargetComparison::operator()(cmTarget *t1, cmTarget *t2) const
+bool cmStrictTargetComparison::operator()(cmTarget const* t1,
+                                          cmTarget const* t2) const
 {
   int nameResult = strcmp(t1->GetName(), t2->GetName());
   if (nameResult == 0)
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index d2b65b2..6aff5f0 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -101,7 +101,7 @@ private:
 };
 
 struct cmStrictTargetComparison {
-  bool operator()(cmTarget *t1, cmTarget *t2) const;
+  bool operator()(cmTarget const* t1, cmTarget const* t2) const;
 };
 
 typedef std::map<cmTarget*,

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

Summary of changes:
 Source/cmGeneratorTarget.cxx      |    3 ++-
 Source/cmGeneratorTarget.h        |    2 +-
 Tests/ExportImport/CMakeLists.txt |    4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake