date:20110519

[Cmake-commits] CMake branch, master, updated. v2.8.4-431-gc5aae0e

2011-05-19 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  c5aae0e625bec60e3a89129501cd8fca726d8dcf (commit)
  from  14abf9f3d8d42701ad2aa43c2835f092b87b7042 (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=c5aae0e625bec60e3a89129501cd8fca726d8dcf
commit c5aae0e625bec60e3a89129501cd8fca726d8dcf
Author: KWSys Robot 
AuthorDate: Fri May 20 00:01:05 2011 -0400
Commit: KWSys Robot 
CommitDate: Fri May 20 00:12:09 2011 -0400

KWSys Nightly Date Stamp

diff --git a/Source/kwsys/kwsysDateStamp.cmake 
b/Source/kwsys/kwsysDateStamp.cmake
index b0c1806..ad1a770 100644
--- a/Source/kwsys/kwsysDateStamp.cmake
+++ b/Source/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2011)
 SET(KWSYS_DATE_STAMP_MONTH 05)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   19)
+SET(KWSYS_DATE_STAMP_DAY   20)

---

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.4-1568-g2d71e81

2011-05-19 Thread 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  2d71e819c60a77787f9cdea5e281289404d9f8a7 (commit)
   via  7039d1fd9b817a3ab6c81b4ef313a0bd6e19778d (commit)
   via  4268e3d7e92eee0871dac1b92f64e18c374c7b43 (commit)
  from  d7b5353dbdc5e1e4015ea67f86e6a5dcf5ff0573 (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=2d71e819c60a77787f9cdea5e281289404d9f8a7
commit 2d71e819c60a77787f9cdea5e281289404d9f8a7
Merge: d7b5353 7039d1f
Author: Brad King 
AuthorDate: Thu May 19 08:32:21 2011 -0400
Commit: CMake Topic Stage 
CommitDate: Thu May 19 08:32:21 2011 -0400

Merge topic 'output-compile-lines' into next

7039d1f Fix CompileCommandOutput test for Make tools not supporting spaces
4268e3d run_compile_commands: Cast istream::get() result to char


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7039d1fd9b817a3ab6c81b4ef313a0bd6e19778d
commit 7039d1fd9b817a3ab6c81b4ef313a0bd6e19778d
Author: Brad King 
AuthorDate: Thu May 19 08:11:34 2011 -0400
Commit: Brad King 
CommitDate: Thu May 19 07:38:06 2011 -0400

Fix CompileCommandOutput test for Make tools not supporting spaces

Use underscores instead of spaces for such Make tools.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 2344af7..e9aed16 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -11,6 +11,7 @@ MACRO(ADD_TEST_MACRO NAME COMMAND)
 --build-generator ${CMAKE_TEST_GENERATOR}
 --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
 --build-project ${proj}
+${${NAME}_EXTRA_OPTIONS}
 --test-command ${COMMAND} ${ARGN})
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${dir}")
 ENDMACRO(ADD_TEST_MACRO)
@@ -2037,6 +2038,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P 
${CMake_SOURCE_DIR}/Utilities/
   ENDFOREACH()
 
   IF(TEST_CompileCommandOutput)
+SET(CompileCommandOutput_EXTRA_OPTIONS
+  --build-options -DMAKE_SUPPORTS_SPACES=${MAKE_IS_GNU})
 ADD_TEST_MACRO(CompileCommandOutput
   "${CMake_BINARY_DIR}/Tests/CMakeLib/runcompilecommands")
   ENDIF()
diff --git a/Tests/CompileCommandOutput/CMakeLists.txt 
b/Tests/CompileCommandOutput/CMakeLists.txt
index ac39b8b..bd8e305 100644
--- a/Tests/CompileCommandOutput/CMakeLists.txt
+++ b/Tests/CompileCommandOutput/CMakeLists.txt
@@ -4,7 +4,12 @@ project (CompileCommandOutput CXX)
 
 SET(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
-ADD_LIBRARY(test1 STATIC "file with spaces.cxx")
+IF(MAKE_SUPPORTS_SPACES)
+  SET(test1_srcs "file with spaces.cxx")
+ELSE()
+  SET(test1_srcs "file_with_underscores.cxx")
+ENDIF()
+ADD_LIBRARY(test1 STATIC ${test1_srcs})
 ADD_LIBRARY(test2 SHARED "../CompileCommandOutput/relative.cxx")
 INCLUDE_DIRECTORIES(${CompileCommandOutput_SOURCE_DIR}/../../Source)
 ADD_EXECUTABLE(CompileCommandOutput compile_command_output.cxx)
diff --git a/Tests/CompileCommandOutput/compile_command_output.cxx 
b/Tests/CompileCommandOutput/compile_command_output.cxx
index 9487c89..145a064 100644
--- a/Tests/CompileCommandOutput/compile_command_output.cxx
+++ b/Tests/CompileCommandOutput/compile_command_output.cxx
@@ -1,9 +1,9 @@
-#include "file with spaces.h"
+#include "file_with_underscores.h"
 #include "relative.h"
 
 int main (int argc, char** argv)
 {
-  file_with_spaces();
+  file_with_underscores();
   relative();
   return 0;
 }
diff --git a/Tests/CompileCommandOutput/file with spaces.cxx 
b/Tests/CompileCommandOutput/file with spaces.cxx
index 5759319..554e176 100644
--- a/Tests/CompileCommandOutput/file with spaces.cxx   
+++ b/Tests/CompileCommandOutput/file with spaces.cxx   
@@ -1,3 +1 @@
-#include "file with spaces.h"
-
-void file_with_spaces() {}
+#include "file_with_underscores.cxx"
diff --git a/Tests/CompileCommandOutput/file with spaces.h 
b/Tests/CompileCommandOutput/file with spaces.h
deleted file mode 100644
index 49b686c..000
--- a/Tests/CompileCommandOutput/file with spaces.h 
+++ /dev/null
@@ -1 +0,0 @@
-void file_with_spaces();
diff --git a/Tests/CompileCommandOutput/file_with_underscores.cxx 
b/Tests/CompileCommandOutput/file_with_underscores.cxx
new file mode 100644
index 000..4f42ccf
--- /dev/null
+++ b/Tests/CompileCommandOutput/file_with_underscores.cxx
@@ -0,0 +1,3 @@
+#include "file_with_underscores.h"
+
+void file_with_underscores() {}
diff --git a/Tests/CompileCommandOutput/file_with_underscores.h 
b/Tests/CompileCommandOutput/file_with_underscores.h
new file mode 100644
index 000..0d73e31
--- /dev/null
+++ b/Tests/CompileCommandOutput/file_with_underscores.h
@@ -0,0 +1 @@
+void file_with_underscores();

http://cma

[Cmake-commits] CMake branch, next, updated. v2.8.4-1565-gd7b5353

2011-05-19 Thread 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  d7b5353dbdc5e1e4015ea67f86e6a5dcf5ff0573 (commit)
   via  3d92c8c82746636a85eca2f2d86f7714bde1465c (commit)
  from  a5d8527a445eae00f45ddf9dd2686e331b6795c1 (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=d7b5353dbdc5e1e4015ea67f86e6a5dcf5ff0573
commit d7b5353dbdc5e1e4015ea67f86e6a5dcf5ff0573
Merge: a5d8527 3d92c8c
Author: Brad King 
AuthorDate: Thu May 19 08:00:40 2011 -0400
Commit: CMake Topic Stage 
CommitDate: Thu May 19 08:00:40 2011 -0400

Merge topic 'string-RANDOM-seed' into next

3d92c8c Explicitly cast time value in cmSystemTools::RandomSeed


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d92c8c82746636a85eca2f2d86f7714bde1465c
commit 3d92c8c82746636a85eca2f2d86f7714bde1465c
Author: Brad King 
AuthorDate: Thu May 19 07:56:04 2011 -0400
Commit: Brad King 
CommitDate: Thu May 19 07:56:04 2011 -0400

Explicitly cast time value in cmSystemTools::RandomSeed

Use static_cast to avoid warnings like

 conversion to ‘unsigned int’ from ‘__time_t’ may alter its value
 conversion to ‘unsigned int’ from ‘__suseconds_t’ may alter its value

We do not care if the value is truncated because we are looking for just
32 bits anyway.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 1491a99..b992054 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2294,8 +2294,8 @@ unsigned int cmSystemTools::RandomSeed()
   struct timeval t;
   gettimeofday(&t, 0);
   unsigned int pid = static_cast(getpid());
-  unsigned int tv_sec = t.tv_sec;
-  unsigned int tv_usec = t.tv_usec;
+  unsigned int tv_sec = static_cast(t.tv_sec);
+  unsigned int tv_usec = static_cast(t.tv_usec);
   // Since tv_usec never fills more than 11 bits we shift it to fill
   // in the slow-changing high-order bits of tv_sec.
   return tv_sec ^ (tv_usec << 21) ^ pid;

---

Summary of changes:
 Source/cmSystemTools.cxx |4 ++--
 1 files changed, 2 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.4-431-gc5aae0e

[Cmake-commits] CMake branch, next, updated. v2.8.4-1568-g2d71e81

[Cmake-commits] CMake branch, next, updated. v2.8.4-1565-gd7b5353

3 matches

Site Navigation

Mail list logo

Footer information