[Cmake-commits] CMake branch, next, updated. v2.8.7-2937-gd2d0ad7
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 d2d0ad76cba19b0ad93eb9beadfd8857aeb0c871 (commit)
via 0b8638821eccd09a50dfb26cfe7a82549c8254c5 (commit)
from 23b713a4d6ac87e3b4f0f6ce1a2bd69fbc9ccab6 (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=d2d0ad76cba19b0ad93eb9beadfd8857aeb0c871
commit d2d0ad76cba19b0ad93eb9beadfd8857aeb0c871
Merge: 23b713a 0b86388
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 28 12:59:14 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 28 12:59:14 2012 -0500
Merge topic 'fix-FindPackageMode-symlink' into next
0b86388 CMakeFindPackageMode: fix 32/64bit detection if 'file' is a symlink
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b8638821eccd09a50dfb26cfe7a82549c8254c5
commit 0b8638821eccd09a50dfb26cfe7a82549c8254c5
Author: Yury G. Kudryashov urkud.ur...@gmail.com
AuthorDate: Fri Feb 24 01:39:39 2012 +0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Feb 28 12:59:01 2012 -0500
CMakeFindPackageMode: fix 32/64bit detection if 'file' is a symlink
diff --git a/Modules/CMakeFindPackageMode.cmake
b/Modules/CMakeFindPackageMode.cmake
index 4296577..59c7ba5 100644
--- a/Modules/CMakeFindPackageMode.cmake
+++ b/Modules/CMakeFindPackageMode.cmake
@@ -71,7 +71,8 @@ if(UNIX)
# use the file utility to check whether itself is 64 bit:
find_program(FILE_EXECUTABLE file)
if(FILE_EXECUTABLE)
-execute_process(COMMAND ${FILE_EXECUTABLE} ${FILE_EXECUTABLE}
OUTPUT_VARIABLE fileOutput ERROR_QUIET)
+get_filename_component(FILE_ABSPATH ${FILE_EXECUTABLE} ABSOLUTE)
+execute_process(COMMAND ${FILE_ABSPATH} ${FILE_ABSPATH}
OUTPUT_VARIABLE fileOutput ERROR_QUIET)
if(${fileOutput} MATCHES 64-bit)
set(CMAKE_SIZEOF_VOID_P 8)
endif()
---
Summary of changes:
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.7-2939-g6c1f286
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 6c1f28618dc31610d4d3ebd06698a04074b15c98 (commit)
via 5e1a5c44da395f8b2c121789e81f4a360a4088bc (commit)
from d2d0ad76cba19b0ad93eb9beadfd8857aeb0c871 (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=6c1f28618dc31610d4d3ebd06698a04074b15c98
commit 6c1f28618dc31610d4d3ebd06698a04074b15c98
Merge: d2d0ad7 5e1a5c4
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 28 13:41:19 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Feb 28 13:41:19 2012 -0500
Merge topic 'test-CMakeCommands' into next
5e1a5c4 Add infrastructure for CMakeCommands tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e1a5c44da395f8b2c121789e81f4a360a4088bc
commit 5e1a5c44da395f8b2c121789e81f4a360a4088bc
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Feb 28 11:34:10 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Feb 28 11:34:10 2012 -0500
Add infrastructure for CMakeCommands tests
Generalize the build_command test framework as a macro to add the
test. Process the CMakeCommands subdirectory explicitly.
diff --git a/Tests/CMakeCommands/CMakeLists.txt
b/Tests/CMakeCommands/CMakeLists.txt
new file mode 100644
index 000..e9e4020
--- /dev/null
+++ b/Tests/CMakeCommands/CMakeLists.txt
@@ -0,0 +1,10 @@
+macro(add_CMakeCommands_test test)
+ add_test(CMakeCommands.${test} ${CMAKE_CMAKE_COMMAND}
+-DCMake_SOURCE_DIR=${CMake_SOURCE_DIR} # TODO: Remove
+-Ddir=${CMAKE_CURRENT_BINARY_DIR}/${test}
+-Dgen=${CMAKE_TEST_GENERATOR}
+-P ${CMAKE_CURRENT_SOURCE_DIR}/${test}/test.cmake
+)
+endmacro()
+
+add_CMakeCommands_test(build_command)
diff --git a/Tests/CMakeCommands/build_command/RunCMake.cmake
b/Tests/CMakeCommands/build_command/test.cmake
similarity index 100%
rename from Tests/CMakeCommands/build_command/RunCMake.cmake
rename to Tests/CMakeCommands/build_command/test.cmake
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9c97828..3a1453b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -48,6 +48,7 @@ IF(BUILD_TESTING)
ADD_SUBDIRECTORY(CMakeLib)
ADD_SUBDIRECTORY(CMakeOnly)
+ ADD_SUBDIRECTORY(CMakeCommands)
ADD_SUBDIRECTORY(FindPackageModeMakefileTest)
@@ -1695,13 +1696,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
add_config_tests(Release)
add_config_tests(RelWithDebInfo)
- add_test(CMakeCommands.build_command ${CMAKE_CMAKE_COMMAND}
--DCMake_SOURCE_DIR=${CMake_SOURCE_DIR}
--Ddir=${CMake_BINARY_DIR}/Tests/CMakeCommands/build_command
--Dgen=${CMAKE_TEST_GENERATOR}
--P ${CMake_SOURCE_DIR}/Tests/CMakeCommands/build_command/RunCMake.cmake
- )
-
ADD_TEST_MACRO(CMakeCommands.target_link_libraries target_link_libraries)
CONFIGURE_FILE(
---
Summary of changes:
Tests/CMakeCommands/CMakeLists.txt | 10 ++
.../build_command/{RunCMake.cmake = test.cmake} |0
Tests/CMakeLists.txt |8 +---
3 files changed, 11 insertions(+), 7 deletions(-)
create mode 100644 Tests/CMakeCommands/CMakeLists.txt
rename Tests/CMakeCommands/build_command/{RunCMake.cmake = test.cmake} (100%)
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.7-456-g4fd4798
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 4fd479816da0a0ff21c6634ea7c82ff27b321b85 (commit) from 26519d591ea28d3f26f34c625c2d57db6f302d63 (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=4fd479816da0a0ff21c6634ea7c82ff27b321b85 commit 4fd479816da0a0ff21c6634ea7c82ff27b321b85 Author: KWSys Robot kwro...@kitware.com AuthorDate: Wed Feb 29 00:01:02 2012 -0500 Commit: KWSys Robot kwro...@kitware.com CommitDate: Wed Feb 29 00:05:04 2012 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 92a27dc..620d90a 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2012) SET(KWSYS_DATE_STAMP_MONTH 02) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 28) +SET(KWSYS_DATE_STAMP_DAY 29) --- 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
