date:20101022

[Cmake-commits] CMake branch, master, updated. v2.8.2-592-g185582d

2010-10-22 Thread KWSys Robot

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  185582d5feb2925975cb669b0874a4a9cbe452d9 (commit)
  from  91b5bc3efa814ba27cbc52280edc363f8991d0cc (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=185582d5feb2925975cb669b0874a4a9cbe452d9
commit 185582d5feb2925975cb669b0874a4a9cbe452d9
Author: KWSys Robot 
AuthorDate: Sat Oct 23 00:01:13 2010 -0400
Commit: KWSys Robot 
CommitDate: Sat Oct 23 00:12:04 2010 -0400

KWSys Nightly Date Stamp

diff --git a/Source/kwsys/kwsysDateStamp.cmake 
b/Source/kwsys/kwsysDateStamp.cmake
index f3f4760..8230e19 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 10)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   22)
+SET(KWSYS_DATE_STAMP_DAY   23)

---

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.2-1100-gad236f3

2010-10-22 Thread 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  ad236f3b5b16af531ef70f015e8087c829bf125c (commit)
   via  6e1282f840fe50707c928079465ab315f07a59fe (commit)
   via  91b5bc3efa814ba27cbc52280edc363f8991d0cc (commit)
   via  e42160f3e057a338f5f5ac22bd4362b779a66254 (commit)
  from  db16b4c5e8edd9983e85f8c5c036a462c5456c5a (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=ad236f3b5b16af531ef70f015e8087c829bf125c
commit ad236f3b5b16af531ef70f015e8087c829bf125c
Merge: db16b4c 6e1282f
Author: David Cole 
AuthorDate: Fri Oct 22 16:31:20 2010 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 22 16:31:20 2010 -0400

Merge topic 'fix-11173' into next

6e1282f ExternalProject: No svn --username if empty (#11173)
91b5bc3 KWSys Nightly Date Stamp
e42160f KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e1282f840fe50707c928079465ab315f07a59fe
commit 6e1282f840fe50707c928079465ab315f07a59fe
Author: David Cole 
AuthorDate: Fri Oct 22 16:09:07 2010 -0400
Commit: David Cole 
CommitDate: Fri Oct 22 16:23:27 2010 -0400

ExternalProject: No svn --username if empty (#11173)

Nor --password. But please do if non-empty. Thank you.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index d76796f..f3c907f 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -985,8 +985,15 @@ function(_ep_add_download_command name)
 get_filename_component(src_name "${source_dir}" NAME)
 get_filename_component(work_dir "${source_dir}" PATH)
 set(comment "Performing download step (SVN checkout) for '${name}'")
+set(svn_user_pw_args "")
+if(svn_username)
+  set(svn_user_pw_args ${svn_user_pw_args} "--username=${svn_username}")
+endif()
+if(svn_password)
+  set(svn_user_pw_args ${svn_user_pw_args} "--password=${svn_password}")
+endif()
 set(cmd ${Subversion_SVN_EXECUTABLE} co ${svn_repository} ${svn_revision}
-  --username=${svn_username} --password=${svn_password} ${src_name})
+  ${svn_user_pw_args} ${src_name})
 list(APPEND depends ${stamp_dir}/${name}-svninfo.txt)
   elseif(git_repository)
 find_package(Git)
@@ -1125,8 +1132,15 @@ function(_ep_add_update_command name)
 get_property(svn_revision TARGET ${name} PROPERTY _EP_SVN_REVISION)
 get_property(svn_username TARGET ${name} PROPERTY _EP_SVN_USERNAME)
 get_property(svn_password TARGET ${name} PROPERTY _EP_SVN_PASSWORD)
+set(svn_user_pw_args "")
+if(svn_username)
+  set(svn_user_pw_args ${svn_user_pw_args} "--username=${svn_username}")
+endif()
+if(svn_password)
+  set(svn_user_pw_args ${svn_user_pw_args} "--password=${svn_password}")
+endif()
 set(cmd ${Subversion_SVN_EXECUTABLE} up ${svn_revision}
-  --username=${svn_username} --password=${svn_password})
+  ${svn_user_pw_args})
 set(always 1)
   elseif(git_repository)
 if(NOT GIT_EXECUTABLE)

---

Summary of changes:
 Modules/ExternalProject.cmake |   18 --
 Source/kwsys/kwsysDateStamp.cmake |2 +-
 2 files changed, 17 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.2-1096-gdb16b4c

2010-10-22 Thread 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  db16b4c5e8edd9983e85f8c5c036a462c5456c5a (commit)
   via  1e4fd5fc9cf294400a2d6b07a02368da942187bc (commit)
  from  0d0b39dec91fae1187047e672ed12ef0659925a7 (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=db16b4c5e8edd9983e85f8c5c036a462c5456c5a
commit db16b4c5e8edd9983e85f8c5c036a462c5456c5a
Merge: 0d0b39d 1e4fd5f
Author: David Cole 
AuthorDate: Fri Oct 22 14:37:11 2010 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 22 14:37:11 2010 -0400

Merge topic 'add-cse-contract-test' into next

1e4fd5f Enable overriding contract test timeout values.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e4fd5fc9cf294400a2d6b07a02368da942187bc
commit 1e4fd5fc9cf294400a2d6b07a02368da942187bc
Author: David Cole 
AuthorDate: Fri Oct 22 14:31:36 2010 -0400
Commit: David Cole 
CommitDate: Fri Oct 22 14:31:36 2010 -0400

Enable overriding contract test timeout values.

Use a longer value as the default timeout (6 hours).

For a per-contract-test timeout value, set ${project}_TEST_TIMEOUT
in the project's RunTest.cmake file. To use a longer value for
all non-specific contract tests, set a CMake cache variable
named CMAKE_CONTRACT_TEST_TIMEOUT_DEFAULT.

All timeout values are in seconds.

Also, patch up last commit to defer evaluation of ENV{HOME}
until EnforceConfig.cmake is included at ctest time. This
allows Windows machines to have "\\" characters in the HOME
environment variable if they want to.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index ed12c65..5155858 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -23,7 +23,7 @@ IF(DEFINED ENV{HOME} AND NOT CTEST_NO_TEST_HOME)
   SET(TEST_HOME_ENV_CODE "# Fake a user home directory to avoid polluting the 
real one.
 # But provide original ENV{HOME} value in ENV{CTEST_REAL_HOME} for tests that
 # need access to the real HOME directory.
-SET(ENV{CTEST_REAL_HOME} \"$ENV{HOME}\")
+SET(ENV{CTEST_REAL_HOME} \"\$ENV{HOME}\")
 SET(ENV{HOME} \"${TEST_HOME}\")
 ")
 ENDIF()
@@ -1776,7 +1776,16 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P 
${CMake_SOURCE_DIR}/Utilities/
 INCLUDE(Contracts/${project}/RunTest.cmake)
 ADD_TEST_MACRO(Contracts.${project}
   ${${project}_RUN_TEST})
-SET_TESTS_PROPERTIES(Contracts.${project} PROPERTIES TIMEOUT 5400)
+# Contract test timeout in seconds.
+# Default to 6 hours.
+IF(DEFINED ${project}_TEST_TIMEOUT)
+  SET(timeout ${${project}_TEST_TIMEOUT})
+ELSEIF(CMAKE_CONTRACT_TEST_TIMEOUT_DEFAULT)
+  SET(timeout ${CMAKE_CONTRACT_TEST_TIMEOUT_DEFAULT})
+ELSE()
+  SET(timeout 21600)
+ENDIF()
+SET_TESTS_PROPERTIES(Contracts.${project} PROPERTIES TIMEOUT ${timeout})
   ENDFOREACH()
 ENDIF(BUILD_TESTING)
 

---

Summary of changes:
 Tests/CMakeLists.txt |   13 +++--
 1 files changed, 11 insertions(+), 2 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.2-1094-g0d0b39d

2010-10-22 Thread Marcus D . Hanwell

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  0d0b39dec91fae1187047e672ed12ef0659925a7 (commit)
   via  beeca11c9bcfd0cc211c8c73f4b00709c914eac3 (commit)
  from  ee0ef5bdc84118423203bea83995a980305a17b4 (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=0d0b39dec91fae1187047e672ed12ef0659925a7
commit 0d0b39dec91fae1187047e672ed12ef0659925a7
Merge: ee0ef5b beeca11
Author: Marcus D. Hanwell 
AuthorDate: Fri Oct 22 11:19:26 2010 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Oct 22 11:19:26 2010 -0400

Merge topic 'external-project-extra-gen' into next

beeca11 Fixed parallel build for generators with EXTRA.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=beeca11c9bcfd0cc211c8c73f4b00709c914eac3
commit beeca11c9bcfd0cc211c8c73f4b00709c914eac3
Author: Marcus D. Hanwell 
AuthorDate: Fri Oct 22 11:16:21 2010 -0400
Commit: Marcus D. Hanwell 
CommitDate: Fri Oct 22 11:16:21 2010 -0400

Fixed parallel build for generators with EXTRA.

Fixed parallel build for projects using generators that have the
CMAKE_EXTRA_GENERATOR as well as CMAKE_GENERATOR. Thanks to Bill Hoffman
for helping me to track this one down, I missed parallel builds.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index d76796f..dfd96cd 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -597,8 +597,7 @@ function(_ep_get_build_command name step cmd_var)
   # CMake project.  Select build command based on generator.
   get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR)
   if("${CMAKE_GENERATOR}" MATCHES "Make" AND
-  ("${cmake_generator}" STREQUAL "${CMAKE_GENERATOR}" OR
-  NOT cmake_generator))
+ ("${cmake_generator}" MATCHES "Make" OR NOT cmake_generator))
 # The project uses the same Makefile generator.  Use recursive make.
 set(cmd "$(MAKE)")
 if(step STREQUAL "INSTALL")

---

Summary of changes:
 Modules/ExternalProject.cmake |3 +--
 1 files changed, 1 insertions(+), 2 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.2-592-g185582d

[Cmake-commits] CMake branch, next, updated. v2.8.2-1100-gad236f3

[Cmake-commits] CMake branch, next, updated. v2.8.2-1096-gdb16b4c

[Cmake-commits] CMake branch, next, updated. v2.8.2-1094-g0d0b39d

4 matches

Site Navigation

Mail list logo

Footer information