[Cmake-commits] CMake branch, next, updated. v2.8.9-134-g2b5ea38

[David Cole]

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  2b5ea38ce9a47e5b7ca234d7fda7570e3e8d0d44 (commit)
       via  3f9fa5cc7fe522ff6722d1b50317b8ebd0c8ad8b (commit)
      from  bff5c2968716edc750a256b8f66c588af50b80bf (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=2b5ea38ce9a47e5b7ca234d7fda7570e3e8d0d44
commit 2b5ea38ce9a47e5b7ca234d7fda7570e3e8d0d44
Merge: bff5c29 3f9fa5c
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 17 10:59:38 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 17 10:59:38 2012 -0400

    Merge topic 'fix-13236-mark-vars-as-advanced' into next
    
    3f9fa5c ProcessorCount: Mark find_program vars as advanced (#13236)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f9fa5cc7fe522ff6722d1b50317b8ebd0c8ad8b
commit 3f9fa5cc7fe522ff6722d1b50317b8ebd0c8ad8b
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 17 10:53:37 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Aug 17 10:56:05 2012 -0400

    ProcessorCount: Mark find_program vars as advanced (#13236)
    
    After each find_program call, mark_as_advanced each find result
    variable to avoid polluting the cache with non-advanced variables

diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
index eff4766..0d1dfda 100644
--- a/Modules/ProcessorCount.cmake
+++ b/Modules/ProcessorCount.cmake
@@ -57,6 +57,7 @@ function(ProcessorCount var)
     # Mac, FreeBSD, OpenBSD (systems with sysctl):
     find_program(ProcessorCount_cmd_sysctl sysctl
       PATHS /usr/sbin /sbin)
+    mark_as_advanced(ProcessorCount_cmd_sysctl)
     if(ProcessorCount_cmd_sysctl)
       execute_process(COMMAND ${ProcessorCount_cmd_sysctl} -n hw.ncpu
         ERROR_QUIET
@@ -69,6 +70,7 @@ function(ProcessorCount var)
   if(NOT count)
     # Linux (systems with getconf):
     find_program(ProcessorCount_cmd_getconf getconf)
+    mark_as_advanced(ProcessorCount_cmd_getconf)
     if(ProcessorCount_cmd_getconf)
       execute_process(COMMAND ${ProcessorCount_cmd_getconf} _NPROCESSORS_ONLN
         ERROR_QUIET
@@ -82,6 +84,7 @@ function(ProcessorCount var)
     # HPUX (systems with machinfo):
     find_program(ProcessorCount_cmd_machinfo machinfo
       PATHS /usr/contrib/bin)
+    mark_as_advanced(ProcessorCount_cmd_machinfo)
     if(ProcessorCount_cmd_machinfo)
       execute_process(COMMAND ${ProcessorCount_cmd_machinfo}
         ERROR_QUIET
@@ -97,6 +100,7 @@ function(ProcessorCount var)
     # IRIX (systems with hinv):
     find_program(ProcessorCount_cmd_hinv hinv
       PATHS /sbin)
+    mark_as_advanced(ProcessorCount_cmd_hinv)
     if(ProcessorCount_cmd_hinv)
       execute_process(COMMAND ${ProcessorCount_cmd_hinv}
         ERROR_QUIET
@@ -112,6 +116,7 @@ function(ProcessorCount var)
     # AIX (systems with lsconf):
     find_program(ProcessorCount_cmd_lsconf lsconf
       PATHS /usr/sbin)
+    mark_as_advanced(ProcessorCount_cmd_lsconf)
     if(ProcessorCount_cmd_lsconf)
       execute_process(COMMAND ${ProcessorCount_cmd_lsconf}
         ERROR_QUIET
@@ -126,6 +131,7 @@ function(ProcessorCount var)
   if(NOT count)
     # QNX (systems with pidin):
     find_program(ProcessorCount_cmd_pidin pidin)
+    mark_as_advanced(ProcessorCount_cmd_pidin)
     if(ProcessorCount_cmd_pidin)
       execute_process(COMMAND ${ProcessorCount_cmd_pidin} info
         ERROR_QUIET
@@ -140,6 +146,7 @@ function(ProcessorCount var)
   if(NOT count)
     # Sun (systems where uname -X emits "NumCPU" in its output):
     find_program(ProcessorCount_cmd_uname uname)
+    mark_as_advanced(ProcessorCount_cmd_uname)
     if(ProcessorCount_cmd_uname)
       execute_process(COMMAND ${ProcessorCount_cmd_uname} -X
         ERROR_QUIET

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

Summary of changes:
 Modules/ProcessorCount.cmake |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake