[Cmake-commits] CMake branch, next, updated. v3.0.0-4136-gb8eab3e

[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, next has been updated
       via  b8eab3e43c2a3520afdd310441ff3a83131cc70a (commit)
       via  38d3fe0785e7691d19d015b43d2bb9d6d17bbd1f (commit)
      from  c3faff3094fa3f67ea72900801f2eea278654ef4 (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=b8eab3e43c2a3520afdd310441ff3a83131cc70a
commit b8eab3e43c2a3520afdd310441ff3a83131cc70a
Merge: c3faff3 38d3fe0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 7 11:31:33 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 7 11:31:33 2014 -0400

    Merge topic 'build-KWIML-always' into next
    
    38d3fe07 Tests: Build and test KWIML even when testing an external CMake


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38d3fe0785e7691d19d015b43d2bb9d6d17bbd1f
commit 38d3fe0785e7691d19d015b43d2bb9d6d17bbd1f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 7 11:23:13 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 7 11:32:06 2014 -0400

    Tests: Build and test KWIML even when testing an external CMake
    
    The CMake_TEST_EXTERNAL_CMAKE option added by commit 9608ef6f (Tests:
    Optionally configure tests exclusively, 2014-03-03) is intended to allow
    one to run the CMake test suite with a compiler that may not be
    supported for hosting the build of CMake itself.  However, we currently
    use the CMake test infrastructure to test KWIML everywhere that CMake
    supports.  In order to continue testing KWIML even in places that CMake
    itself does not build, include it even when testing an external CMake.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41ff4a6..e210f74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,12 +201,6 @@ endmacro()
 #-----------------------------------------------------------------------
 macro (CMAKE_BUILD_UTILITIES)
   #---------------------------------------------------------------------
-  # Create the KWIML library for CMake.
-  set(KWIML cmIML)
-  set(KWIML_HEADER_ROOT ${CMake_BINARY_DIR}/Utilities)
-  add_subdirectory(Utilities/KWIML)
-
-  #---------------------------------------------------------------------
   # Create the kwsys library for CMake.
   set(KWSYS_NAMESPACE cmsys)
   set(KWSYS_USE_SystemTools 1)
@@ -465,6 +459,11 @@ if("x${CMAKE_TESTS_CDASH_SERVER}" STREQUAL "x")
   set(CMAKE_TESTS_CDASH_SERVER "http://open.cdash.org")
 endif()
 
+# Create the KWIML library for CMake.
+set(KWIML cmIML)
+set(KWIML_HEADER_ROOT ${CMake_BINARY_DIR}/Utilities)
+add_subdirectory(Utilities/KWIML)
+
 if(NOT CMake_TEST_EXTERNAL_CMAKE)
   # build the utilities (a macro defined in this file)
   CMAKE_BUILD_UTILITIES()

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

Summary of changes:
 CMakeLists.txt |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake