[Cmake-commits] CMake branch, next, updated. v3.1.1-2333-g909bcad

[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  909bcad178c51bef0a063ab1d00e9a64c466261c (commit)
       via  148ad4b304ddc7cd151e022edf71b0fa89e50dcb (commit)
      from  9dfe97f83ff4472e34e161d978efcfba7ed793a2 (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=909bcad178c51bef0a063ab1d00e9a64c466261c
commit 909bcad178c51bef0a063ab1d00e9a64c466261c
Merge: 9dfe97f 148ad4b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 10:24:21 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 26 10:24:21 2015 -0500

    Merge topic 'cmake-builtin-targets-use-ninja-terminal' into next
    
    148ad4b3 Configure some CMake-provided targets with USES_TERMINAL (#14915)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=148ad4b304ddc7cd151e022edf71b0fa89e50dcb
commit 148ad4b304ddc7cd151e022edf71b0fa89e50dcb
Author:     Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Sat Jan 24 19:42:31 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 26 10:16:58 2015 -0500

    Configure some CMake-provided targets with USES_TERMINAL (#14915)
    
    This will make them use the 'console' pool with the Ninja generator.
    Impacted targets are:
    - Built-in targets: install, install/local, install/strip, tests,
      package, package_source, rebuild_cache
    - Targets provided by the CTestTargets module: Nightly, Continuous,
      Experimental,
      and all their variants (*Start, *Configure, ...)

diff --git a/Modules/CTestTargets.cmake b/Modules/CTestTargets.cmake
index 5b6e062..1157850 100644
--- a/Modules/CTestTargets.cmake
+++ b/Modules/CTestTargets.cmake
@@ -67,6 +67,7 @@ if(NOT _CTEST_TARGETS_ADDED)
   foreach(mode Experimental Nightly Continuous NightlyMemoryCheck)
     add_custom_target(${mode}
       ${CMAKE_CTEST_COMMAND} ${__conf_types} -D ${mode}
+      USES_TERMINAL
       )
     set_property(TARGET ${mode} PROPERTY RULE_LAUNCH_CUSTOM "")
     set_property(TARGET ${mode} PROPERTY FOLDER "CTestDashboardTargets")
@@ -82,6 +83,7 @@ if(NOT _CTEST_TARGETS_ADDED)
           )
         add_custom_target(${mode}${testtype}
           ${CMAKE_CTEST_COMMAND} ${__conf_types} -D ${mode}${testtype}
+          USES_TERMINAL
           )
         set_property(TARGET ${mode}${testtype} PROPERTY RULE_LAUNCH_CUSTOM "")
         set_property(TARGET ${mode}${testtype} PROPERTY FOLDER "CTestDashboardTargets")
@@ -94,6 +96,7 @@ if(NOT _CTEST_TARGETS_ADDED)
   if(CTEST_TEST_TARGET_ALIAS)
     add_custom_target(${CTEST_TEST_TARGET_ALIAS}
       ${CMAKE_CTEST_COMMAND} ${__conf_types}
+      USES_TERMINAL
       )
   endif()
 endif()
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index dd3b1ec..4c95a9f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2191,7 +2191,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
       = this->CreateGlobalTarget(this->GetPackageTargetName(),
                                  "Run CPack packaging tool...",
                                  &cpackCommandLines, depends,
-                                 workingDir.c_str(), /*uses_terminal*/false);
+                                 workingDir.c_str(), /*uses_terminal*/true);
     }
   // CPack source
   const char* packageSourceTargetName = this->GetPackageSourceTargetName();
@@ -2215,7 +2215,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
         = this->CreateGlobalTarget(packageSourceTargetName,
                                    "Run CPack packaging tool for source...",
                                    &cpackCommandLines, depends,
-                                   workingDir.c_str(), /*uses_terminal*/false);
+                                   workingDir.c_str(), /*uses_terminal*/true);
       }
     }
 
@@ -2241,7 +2241,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
     (*targets)[this->GetTestTargetName()]
       = this->CreateGlobalTarget(this->GetTestTargetName(),
         "Running tests...", &cpackCommandLines, depends, 0,
-        /*uses_terminal*/false);
+        /*uses_terminal*/true);
     }
 
   //Edit Cache
@@ -2296,7 +2296,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
     (*targets)[rebuildCacheTargetName] =
       this->CreateGlobalTarget(
         rebuildCacheTargetName, "Running CMake to regenerate build system...",
-        &cpackCommandLines, depends, 0, /*uses_terminal*/false);
+        &cpackCommandLines, depends, 0, /*uses_terminal*/true);
     }
 
   //Install
@@ -2377,7 +2377,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
     (*targets)[this->GetInstallTargetName()] =
       this->CreateGlobalTarget(
         this->GetInstallTargetName(), "Install the project...",
-        &cpackCommandLines, depends, 0, /*uses_terminal*/false);
+        &cpackCommandLines, depends, 0, /*uses_terminal*/true);
 
     // install_local
     if(const char* install_local = this->GetInstallLocalTargetName())
@@ -2393,7 +2393,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
       (*targets)[install_local] =
         this->CreateGlobalTarget(
           install_local, "Installing only the local directory...",
-          &cpackCommandLines, depends, 0, /*uses_terminal*/false);
+          &cpackCommandLines, depends, 0, /*uses_terminal*/true);
       }
 
     // install_strip
@@ -2410,7 +2410,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
       (*targets)[install_strip] =
         this->CreateGlobalTarget(
           install_strip, "Installing the project stripped...",
-          &cpackCommandLines, depends, 0, /*uses_terminal*/false);
+          &cpackCommandLines, depends, 0, /*uses_terminal*/true);
       }
     }
 }

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

Summary of changes:
 Modules/CTestTargets.cmake   |    3 +++
 Source/cmGlobalGenerator.cxx |   14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake