[Cmake-commits] CMake branch, next, updated. v2.8.3-551-g20ae1b5
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 20ae1b5b8908f183b389361e76efc693af9af03e (commit)
via 680ca4baab85cbc1be98bcfd81b7e4402ffa8d84 (commit)
from 25be1b070297dea7def03bf95009c752426c54ab (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=20ae1b5b8908f183b389361e76efc693af9af03e
commit 20ae1b5b8908f183b389361e76efc693af9af03e
Merge: 25be1b0 680ca4b
Author: David Cole
AuthorDate: Mon Nov 8 09:44:24 2010 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 8 09:44:24 2010 -0500
Merge topic 'add-ProcessorCount-module' into next
680ca4b Add ProcessorCount support for QNX via pidin. (#11302)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=680ca4baab85cbc1be98bcfd81b7e4402ffa8d84
commit 680ca4baab85cbc1be98bcfd81b7e4402ffa8d84
Author: David Cole
AuthorDate: Mon Nov 8 09:37:04 2010 -0500
Commit: David Cole
CommitDate: Mon Nov 8 09:37:04 2010 -0500
Add ProcessorCount support for QNX via pidin. (#11302)
Thanks to Rolf Eike Beer for the code snippet
parsing the pidin output.
diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
index 5ccfbff..5c38267 100644
--- a/Modules/ProcessorCount.cmake
+++ b/Modules/ProcessorCount.cmake
@@ -42,7 +42,7 @@ function(ProcessorCount var)
message("ProcessorCount: using sysctl '${ProcessorCount_cmd_sysctl}'")
endif()
else()
-# Linux (and other systems with getconf):
+# Linux (systems with getconf):
find_program(ProcessorCount_cmd_getconf getconf)
if(ProcessorCount_cmd_getconf)
execute_process(COMMAND ${ProcessorCount_cmd_getconf} _NPROCESSORS_ONLN
@@ -50,9 +50,22 @@ function(ProcessorCount var)
OUTPUT_VARIABLE count)
message("ProcessorCount: using getconf '${ProcessorCount_cmd_getconf}'")
endif()
+
+if(NOT count)
+ # QNX (systems with pidin):
+ find_program(ProcessorCount_cmd_pidin pidin)
+ if(ProcessorCount_cmd_pidin)
+execute_process(COMMAND ${ProcessorCount_cmd_pidin} info
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ OUTPUT_VARIABLE pidin_output)
+string(REGEX MATCHALL "Processor[0-9]+: " procs "${pidin_output}")
+list(LENGTH procs count)
+message("ProcessorCount: using pidin '${ProcessorCount_cmd_pidin}'")
+ endif()
+endif()
endif()
- # Execute this code when there is no 'sysctl' or 'getconf' or
+ # Execute this code when there is no 'sysctl' or 'getconf' or 'pidin' or
# when previously executed methods return empty output:
#
if(NOT count)
@@ -65,5 +78,12 @@ function(ProcessorCount var)
endif()
endif()
+ # Ensure an integer return (avoid inadvertently returning an empty string
+ # or an error string)... If it's not a decimal integer, return 0:
+ #
+ if(NOT count MATCHES "^[0-9]+$")
+set(count 0)
+ endif()
+
set(${var} ${count} PARENT_SCOPE)
endfunction()
diff --git a/Tests/CMakeTests/ProcessorCountTest.cmake.in
b/Tests/CMakeTests/ProcessorCountTest.cmake.in
index 0815fd8..ac7a1da 100644
--- a/Tests/CMakeTests/ProcessorCountTest.cmake.in
+++ b/Tests/CMakeTests/ProcessorCountTest.cmake.in
@@ -3,7 +3,11 @@ include(ProcessorCount)
ProcessorCount(processor_count)
message("processor_count='${processor_count}'")
+if(NOT processor_count MATCHES "^[0-9]+$")
+ message(FATAL_ERROR "ProcessorCount function returned a non-integer")
+endif()
+
if(processor_count EQUAL 0)
message(FATAL_ERROR "could not determine number of processors
-- Additional code needed in ProcessorCount.cmake?")
+- Additional code for this platform needed in ProcessorCount.cmake?")
endif()
---
Summary of changes:
Modules/ProcessorCount.cmake | 24 ++--
Tests/CMakeTests/ProcessorCountTest.cmake.in |6 +-
2 files changed, 27 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.3-555-g9c6907c
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 9c6907c1d921cfd1f87cf0ece3fc85a901ef27d1 (commit) via da778eeb4b095e0d09f60e00e55c9e6ec43b7d7a (commit) via d95017deec954ad81253c9d545eaeb323c52ac0e (commit) via c5a47ad148a7a470eaebd350917ea0e036e77ac9 (commit) from 20ae1b5b8908f183b389361e76efc693af9af03e (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=9c6907c1d921cfd1f87cf0ece3fc85a901ef27d1 commit 9c6907c1d921cfd1f87cf0ece3fc85a901ef27d1 Merge: 20ae1b5 da778ee Author: Brad King AuthorDate: Mon Nov 8 11:00:55 2010 -0500 Commit: Brad King CommitDate: Mon Nov 8 11:00:55 2010 -0500 Merge branch 'master' into next --- Summary of changes: Source/kwsys/kwsysDateStamp.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.3-557-g78c1abd
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 78c1abde46641d7a02e19bd8b5f1e72f295dbf5d (commit)
via 20ceccc4f28474c89af5797640852f966b731be4 (commit)
from 9c6907c1d921cfd1f87cf0ece3fc85a901ef27d1 (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=78c1abde46641d7a02e19bd8b5f1e72f295dbf5d
commit 78c1abde46641d7a02e19bd8b5f1e72f295dbf5d
Merge: 9c6907c 20ceccc
Author: Brad King
AuthorDate: Mon Nov 8 11:23:15 2010 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 8 11:23:15 2010 -0500
Merge topic 'FindPerlLibs-mac' into next
20ceccc FindPerlLibs: Fix for Mac locally applied patches
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20ceccc4f28474c89af5797640852f966b731be4
commit 20ceccc4f28474c89af5797640852f966b731be4
Author: Dave Abrahams
AuthorDate: Mon Nov 8 11:06:56 2010 -0500
Commit: Brad King
CommitDate: Mon Nov 8 11:09:41 2010 -0500
FindPerlLibs: Fix for Mac locally applied patches
Previously FindPerlLibs did not work with the Mac stock Perl because it
includes patches. From "perl -V":
Locally applied patches:
/Library/Perl/Updates/ comes before system perl directories
installprivlib and installarchlib points to the Updates directory
Adjust paths accordingly.
diff --git a/Modules/FindPerlLibs.cmake b/Modules/FindPerlLibs.cmake
index 4cb0263..0d620e3 100644
--- a/Modules/FindPerlLibs.cmake
+++ b/Modules/FindPerlLibs.cmake
@@ -147,6 +147,32 @@ if (PERL_EXECUTABLE)
string(REGEX REPLACE "install[a-z]+='([^']+)'.*" "\\1" PERL_VENDORLIB
${PERL_VENDORLIB_OUTPUT_VARIABLE})
endif (NOT PERL_VENDORLIB_RESULT_VARIABLE)
+ macro(perl_adjust_darwin_lib_variable varname)
+string( TOUPPER PERL_${varname} FINDPERL_VARNAME )
+string( TOLOWER install${varname} PERL_VARNAME )
+
+if (NOT PERL_MINUSV_OUTPUT_VARIABLE)
+ execute_process(
+COMMAND
+${PERL_EXECUTABLE} -V
+OUTPUT_VARIABLE
+PERL_MINUSV_OUTPUT_VARIABLE
+RESULT_VARIABLE
+PERL_MINUSV_RESULT_VARIABLE
+)
+endif()
+
+if (NOT PERL_MINUSV_RESULT_VARIABLE)
+ string(REGEX MATCH "(${PERL_VARNAME}.*points? to the Updates directory)"
+PERL_NEEDS_ADJUSTMENT ${PERL_MINUSV_OUTPUT_VARIABLE})
+
+ if (PERL_NEEDS_ADJUSTMENT)
+string(REGEX REPLACE "(.*)/Updates/" "/System/\\1/"
${FINDPERL_VARNAME} ${${FINDPERL_VARNAME}})
+ endif (PERL_NEEDS_ADJUSTMENT)
+
+endif (NOT PERL_MINUSV_RESULT_VARIABLE)
+ endmacro()
+
### PERL_ARCHLIB
execute_process(
COMMAND
@@ -158,6 +184,7 @@ if (PERL_EXECUTABLE)
)
if (NOT PERL_ARCHLIB_RESULT_VARIABLE)
string(REGEX REPLACE "install[a-z]+='([^']+)'.*" "\\1" PERL_ARCHLIB
${PERL_ARCHLIB_OUTPUT_VARIABLE})
+perl_adjust_darwin_lib_variable( ARCHLIB )
endif (NOT PERL_ARCHLIB_RESULT_VARIABLE)
### PERL_PRIVLIB
@@ -171,6 +198,7 @@ if (PERL_EXECUTABLE)
)
if (NOT PERL_PRIVLIB_RESULT_VARIABLE)
string(REGEX REPLACE "install[a-z]+='([^']+)'.*" "\\1" PERL_PRIVLIB
${PERL_PRIVLIB_OUTPUT_VARIABLE})
+perl_adjust_darwin_lib_variable( PRIVLIB )
endif (NOT PERL_PRIVLIB_RESULT_VARIABLE)
---
Summary of changes:
Modules/FindPerlLibs.cmake | 28
1 files changed, 28 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.3-559-g9d841b5
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 9d841b5b8b47c378ee49eec0ce41e503d9cd05b3 (commit) via 1e26f7c68b9cc1bbaf173cb6a7c6137bb2d829f8 (commit) from 78c1abde46641d7a02e19bd8b5f1e72f295dbf5d (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=9d841b5b8b47c378ee49eec0ce41e503d9cd05b3 commit 9d841b5b8b47c378ee49eec0ce41e503d9cd05b3 Merge: 78c1abd 1e26f7c Author: David Cole AuthorDate: Mon Nov 8 11:47:30 2010 -0500 Commit: CMake Topic Stage CommitDate: Mon Nov 8 11:47:30 2010 -0500 Merge topic 'suppress-dashboard-warnings' into next 1e26f7c Suppress "loop was vectorized" "warnings." http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e26f7c68b9cc1bbaf173cb6a7c6137bb2d829f8 commit 1e26f7c68b9cc1bbaf173cb6a7c6137bb2d829f8 Author: David Cole AuthorDate: Mon Nov 8 11:29:28 2010 -0500 Commit: David Cole CommitDate: Mon Nov 8 11:30:19 2010 -0500 Suppress "loop was vectorized" "warnings." Eliminate appearance on dashboard results from Intel compilers. diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in index d5789ed..882fa4c 100644 --- a/CTestCustom.cmake.in +++ b/CTestCustom.cmake.in @@ -24,6 +24,7 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION "is not used for resolving any symbol" "Clock skew detected" "remark\\(1209" + "remark: .*LOOP WAS VECTORIZED" "LINK : warning LNK4089: all references to.*ADVAPI32.dll.*discarded by /OPT:REF" "LINK : warning LNK4089: all references to.*USER32.dll.*discarded by /OPT:REF" "Warning: library was too large for page size.*" --- Summary of changes: CTestCustom.cmake.in |1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.3-7-gbbb3d81
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, master has been updated via bbb3d81d383737f4111f7303b36c23c537aaf17a (commit) from da778eeb4b095e0d09f60e00e55c9e6ec43b7d7a (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=bbb3d81d383737f4111f7303b36c23c537aaf17a commit bbb3d81d383737f4111f7303b36c23c537aaf17a Author: KWSys Robot AuthorDate: Tue Nov 9 00:01:04 2010 -0500 Commit: KWSys Robot CommitDate: Tue Nov 9 00:10:02 2010 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 69c7cb8..5ff8eec 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2010) SET(KWSYS_DATE_STAMP_MONTH 11) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 08) +SET(KWSYS_DATE_STAMP_DAY 09) --- Summary of changes: Source/kwsys/kwsysDateStamp.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
