[Cmake-commits] CMake branch, next, updated. v3.3.2-3426-gbf7a609
Brad King
brad.king at kitware.com
Thu Oct 1 09:47:23 EDT 2015
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 bf7a609459b8dcbfb59b4da57c7cbe1787a56c6a (commit)
via bd0cb84c06f325439c32fe0dee4e05452d0f4cb6 (commit)
via 8bdbd3e1b740e34fc7e68120536fb5c8f1deedee (commit)
via b5979e9168a0a965c0e29785c487784d978af9c2 (commit)
via c326dc92fc6677df1d8e7ed345356a5001accd0e (commit)
from 60e17b88cf7896c5ccb444974dfaa26fd3025da1 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf7a609459b8dcbfb59b4da57c7cbe1787a56c6a
commit bf7a609459b8dcbfb59b4da57c7cbe1787a56c6a
Merge: 60e17b8 bd0cb84
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:47:22 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 1 09:47:22 2015 -0400
Merge topic 'cpack-tests-fix' into next
bd0cb84c Tests: Avoid OS X 10.5 limitation warning in RunCMake.CPack* tests
8bdbd3e1 Tests: Add trailing newlines to generated sources in RunCMake.CPack_* tests
b5979e91 fixup! CPack: fix TGZ test missing compiler errors
c326dc92 fixup! CPack: fix TGZ test missing compiler errors
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd0cb84c06f325439c32fe0dee4e05452d0f4cb6
commit bd0cb84c06f325439c32fe0dee4e05452d0f4cb6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:38:19 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 09:38:46 2015 -0400
Tests: Avoid OS X 10.5 limitation warning in RunCMake.CPack* tests
The DEPENDENCIES test case uses install(TARGETS) and so generates a warning:
CMake Warning in CMakeLists.txt:
WARNING: Target "test_prog" has runtime paths which cannot be changed
during install. To change runtime paths, OS X version 10.6 or newer is
required. Therefore, runtime paths will not be changed when installing.
CMAKE_BUILD_WITH_INSTALL_RPATH may be used to work around this limitation.
Set CMAKE_BUILD_WITH_INSTALL_RPATH to avoid the warning since we do not
need to run the binaries from the build tree anyway.
diff --git a/Tests/RunCMake/CPack/DEPENDENCIES.cmake b/Tests/RunCMake/CPack/DEPENDENCIES.cmake
index 8a0ba35..4f6d65f 100644
--- a/Tests/RunCMake/CPack/DEPENDENCIES.cmake
+++ b/Tests/RunCMake/CPack/DEPENDENCIES.cmake
@@ -1,3 +1,5 @@
+set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
+
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.hpp"
"int test_lib();\n")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bdbd3e1b740e34fc7e68120536fb5c8f1deedee
commit 8bdbd3e1b740e34fc7e68120536fb5c8f1deedee
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:27:02 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 09:29:28 2015 -0400
Tests: Add trailing newlines to generated sources in RunCMake.CPack_* tests
This avoids compiler warnings on stderr while building them.
diff --git a/Tests/RunCMake/CPack/DEPENDENCIES.cmake b/Tests/RunCMake/CPack/DEPENDENCIES.cmake
index 0aef925..8a0ba35 100644
--- a/Tests/RunCMake/CPack/DEPENDENCIES.cmake
+++ b/Tests/RunCMake/CPack/DEPENDENCIES.cmake
@@ -1,11 +1,11 @@
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.hpp"
- "int test_lib();")
+ "int test_lib();\n")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp"
- "#include \"test_lib.hpp\"\nint test_lib() {return 0;}")
+ "#include \"test_lib.hpp\"\nint test_lib() {return 0;}\n")
add_library(test_lib SHARED "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/main.cpp"
- "#include \"test_lib.hpp\"\nint main() {return test_lib();}")
+ "#include \"test_lib.hpp\"\nint main() {return test_lib();}\n")
add_executable(test_prog "${CMAKE_CURRENT_BINARY_DIR}/main.cpp")
target_link_libraries(test_prog test_lib)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5979e9168a0a965c0e29785c487784d978af9c2
commit b5979e9168a0a965c0e29785c487784d978af9c2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:26:30 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 09:29:21 2015 -0400
fixup! CPack: fix TGZ test missing compiler errors
Use run_cmake_command wrapper.
diff --git a/Tests/RunCMake/CPack/CPackTestHelpers.cmake b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
index 153ff50..aef1086 100644
--- a/Tests/RunCMake/CPack/CPackTestHelpers.cmake
+++ b/Tests/RunCMake/CPack/CPackTestHelpers.cmake
@@ -10,14 +10,12 @@ function(run_cpack_test TEST_NAME types build)
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
# execute cmake
- unset(RunCMake_TEST_COMMAND)
set(RunCMake_TEST_OPTIONS "-DGENERATOR_TYPE=${TEST_TYPE}")
run_cmake(${TEST_NAME})
# execute optional build step
if(build)
- set(RunCMake_TEST_COMMAND "${CMAKE_COMMAND}" --build "${RunCMake_TEST_BINARY_DIR}")
- run_cmake(${TEST_NAME})
+ run_cmake_command(${TEST_NAME}-Build "${CMAKE_COMMAND}" --build "${RunCMake_TEST_BINARY_DIR}")
endif()
# execute cpack
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c326dc92fc6677df1d8e7ed345356a5001accd0e
commit c326dc92fc6677df1d8e7ed345356a5001accd0e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 1 09:25:25 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 1 09:25:27 2015 -0400
fixup! CPack: fix TGZ test missing compiler errors
We know the CMAKE_COMMAND is always available.
diff --git a/Tests/RunCMake/CPack/TGZ/Helpers.cmake b/Tests/RunCMake/CPack/TGZ/Helpers.cmake
index 4ce2590..f14d532 100644
--- a/Tests/RunCMake/CPack/TGZ/Helpers.cmake
+++ b/Tests/RunCMake/CPack/TGZ/Helpers.cmake
@@ -1,7 +1,7 @@
set(ALL_FILES_GLOB "*.tar.gz")
function(getPackageContent FILE RESULT_VAR)
- execute_process(COMMAND ${TAR_EXECUTABLE} -ztvf ${FILE}
+ execute_process(COMMAND ${CMAKE_COMMAND} -E tar -ztvf ${FILE}
OUTPUT_VARIABLE package_content_
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake b/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake
index c244984..dbaf682 100644
--- a/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake
+++ b/Tests/RunCMake/CPack/TGZ/Prerequirements.cmake
@@ -1,4 +1,4 @@
function(get_test_prerequirements found_var config_file)
- file(WRITE "${config_file}" "set(TAR_EXECUTABLE \"${CMAKE_COMMAND}\" -E tar)")
+ file(WRITE "${config_file}" "")
set(${found_var} true PARENT_SCOPE)
endfunction()
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CPack/CPackTestHelpers.cmake | 4 +---
Tests/RunCMake/CPack/DEPENDENCIES.cmake | 8 +++++---
Tests/RunCMake/CPack/TGZ/Helpers.cmake | 2 +-
Tests/RunCMake/CPack/TGZ/Prerequirements.cmake | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list