[Cmake-commits] CMake branch, next, updated. v2.8.7-2295-g070ec8c
Rolf Eike Beer
eike at sf-mail.de
Thu Jan 26 17:29:08 EST 2012
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 070ec8c4d156c6fa8608964c346abba74b961285 (commit)
via 16d49068e0f5b505a6db12a7bce35b7d77e27832 (commit)
via f66571dc8380eea2f2401a58f2d393da5eb43798 (commit)
via 8c8a2b67c894924f9fa7e3319b83e237bc56774f (commit)
from c7873aa952a8fc5bcf4883afcf0bf12833d764b3 (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=070ec8c4d156c6fa8608964c346abba74b961285
commit 070ec8c4d156c6fa8608964c346abba74b961285
Merge: c7873aa 16d4906
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 26 17:29:02 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 17:29:02 2012 -0500
Merge topic 'version-extra-debugging' into next
16d4906 add some debugging for module version support
f66571d Merge remote-tracking branch 'stage/improve-findgettext' into version-extra-debugging
8c8a2b6 Merge remote-tracking branch 'stage/perl-version' into version-extra-debugging
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16d49068e0f5b505a6db12a7bce35b7d77e27832
commit 16d49068e0f5b505a6db12a7bce35b7d77e27832
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 26 23:09:50 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Jan 26 23:28:41 2012 +0100
add some debugging for module version support
This will output some hints why the normal version detection does not work.
I'll revert this once the nightly builds gave me the the information I need to
fix this.
diff --git a/Modules/FindBISON.cmake b/Modules/FindBISON.cmake
index edde9eb..ef935a9 100644
--- a/Modules/FindBISON.cmake
+++ b/Modules/FindBISON.cmake
@@ -77,6 +77,8 @@ IF(BISON_EXECUTABLE)
BISON_VERSION "${BISON_version_output}")
ELSE()
SET(BISON_VERSION "unknown")
+message(AUTHOR_WARNING "Module Version ##DEBUGGING##")
+message(AUTHOR_WARNING "version output was: '${BISON_version_output}'")
ENDIF()
ENDIF()
diff --git a/Modules/FindGettext.cmake b/Modules/FindGettext.cmake
index 635090b..adcca73 100644
--- a/Modules/FindGettext.cmake
+++ b/Modules/FindGettext.cmake
@@ -50,6 +50,9 @@ IF(GETTEXT_MSGMERGE_EXECUTABLE)
OUTPUT_STRIP_TRAILING_WHITESPACE)
IF (gettext_version MATCHES "^msgmerge \\(.*\\) [0-9]")
STRING(REGEX REPLACE "^msgmerge \\([^\\)]*\\) ([0-9\\.]+[^ \n]*).*" "\\1" GETTEXT_VERSION_STRING "${gettext_version}")
+else()
+message(AUTHOR_WARNING "Module Version ##DEBUGGING##")
+message(AUTHOR_WARNING "raw msgmerge output was: '${gettext_version}'")
ENDIF()
UNSET(gettext_version)
ENDIF(GETTEXT_MSGMERGE_EXECUTABLE)
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 59efe4b..af5e97d 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -246,6 +246,13 @@ if (OPENSSL_INCLUDE_DIR)
string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING)
endif (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
+# debug why there is strange output on one test machine
+if (OPENSSL_VERSION_PATCH_STRING AND NOT OPENSSL_VERSION_PATCH_STRING MATCHES "[a-z]")
+message(AUTHOR_WARNING "Module Version ##DEBUGGING##")
+message(AUTHOR_WARNING "string from header was: '${openssl_version_str}'")
+message(AUTHOR_WARNING "parsed patch version number was: '${OPENSSL_VERSION_PATCH}' ascii num '${OPENSSL_VERSION_PATCH_ASCII}'")
+endif()
+
set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
endif (_OPENSSL_VERSION)
endif (OPENSSL_INCLUDE_DIR)
diff --git a/Modules/FindPerl.cmake b/Modules/FindPerl.cmake
index 4ccb76c..54b38d4 100644
--- a/Modules/FindPerl.cmake
+++ b/Modules/FindPerl.cmake
@@ -40,6 +40,18 @@ FIND_PROGRAM(PERL_EXECUTABLE
PATHS ${PERL_POSSIBLE_BIN_PATHS}
)
+macro(dump_perl_info)
+ foreach(PERL_ARG "-V:version" "-V" "-v" "--version" "-h" "--help")
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} ${PERL_ARG}
+ OUTPUT_VARIABLE PERL_VERSION_OUTPUT_VARIABLE
+ ERROR_VARIABLE PERL_VERSION_ERROR_VARIABLE
+ RESULT_VARIABLE PERL_VERSION_RESULT_VARIABLE)
+message(AUTHOR_WARNING "argument: ${PERL_VARG} result: '${PERL_VERSION_RESULT_VARIABLE}'")
+message(AUTHOR_WARNING "stdout: '${PERL_VERSION_OUTPUT_VARIABLE}'")
+message(AUTHOR_WARNING "stderr: '${PERL_VERSION_ERROR_VARIABLE}'")
+ endforeach(PERL_ARG)
+endmacro(dump_perl_info)
+
IF(PERL_EXECUTABLE)
### PERL_VERSION
EXECUTE_PROCESS(
@@ -54,6 +66,14 @@ IF(PERL_EXECUTABLE)
)
IF(NOT PERL_VERSION_RESULT_VARIABLE)
STRING(REGEX REPLACE "version='([^']+)'.*" "\\1" PERL_VERSION_STRING ${PERL_VERSION_OUTPUT_VARIABLE})
+if (PERL_VERSION_STRING STREQUAL "UNKNOWN")
+message(AUTHOR_WARNING "Module Version ##DEBUGGING##")
+message(AUTHOR_WARNING "raw perl output was: '${PERL_VERSION_OUTPUT_VARIABLE}'")
+dump_perl_info()
+endif()
+else()
+message(AUTHOR_WARNING "Module Version ##DEBUGGING##")
+dump_perl_info()
ENDIF(NOT PERL_VERSION_RESULT_VARIABLE)
ENDIF(PERL_EXECUTABLE)
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index d5a2a5e..67d4528 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -96,6 +96,9 @@ if(PYTHON_EXECUTABLE)
if(PYTHON_VERSION_STRING MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+.*")
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" PYTHON_VERSION_PATCH "${PYTHON_VERSION_STRING}")
endif()
+else()
+message(AUTHOR_WARNING "Module Version ##DEBUGGING##")
+message(AUTHOR_WARNING "raw python output was: '${_VERSION}'")
endif()
endif(PYTHON_EXECUTABLE)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f66571dc8380eea2f2401a58f2d393da5eb43798
commit f66571dc8380eea2f2401a58f2d393da5eb43798
Merge: 8c8a2b6 77e6c6f
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 26 23:28:33 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Jan 26 23:28:33 2012 +0100
Merge remote-tracking branch 'stage/improve-findgettext' into version-extra-debugging
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c8a2b67c894924f9fa7e3319b83e237bc56774f
commit 8c8a2b67c894924f9fa7e3319b83e237bc56774f
Merge: 208569f d9c3ac9
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 26 23:28:27 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Jan 26 23:28:27 2012 +0100
Merge remote-tracking branch 'stage/perl-version' into version-extra-debugging
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBISON.cmake | 2 ++
Modules/FindGettext.cmake | 3 +++
Modules/FindOpenSSL.cmake | 7 +++++++
Modules/FindPerl.cmake | 20 ++++++++++++++++++++
Modules/FindPythonInterp.cmake | 3 +++
5 files changed, 35 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list