[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1762-g4f8deba
Brad King
brad.king at kitware.com
Wed Feb 26 09:15:06 EST 2014
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 4f8deba4cfdb6055a60d124f1658a8a830d856e7 (commit)
via 631a608201684ef46153903926025311ec44b1bc (commit)
via 37435201469a91fe222c7aa87df07dedf7124eab (commit)
from 5e2d61f557a308eca7fb05234d9ec70c3a83c394 (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=4f8deba4cfdb6055a60d124f1658a8a830d856e7
commit 4f8deba4cfdb6055a60d124f1658a8a830d856e7
Merge: 5e2d61f 631a608
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 26 09:15:06 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 26 09:15:06 2014 -0500
Merge topic 'dev/faster-evis' into next
631a6082 tests: Simplify RunCMake.CMP0052 test
37435201 Utilities/Release: Use ${VAR} instead of @VAR@ syntax
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=631a608201684ef46153903926025311ec44b1bc
commit 631a608201684ef46153903926025311ec44b1bc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 26 09:14:44 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 26 09:14:44 2014 -0500
tests: Simplify RunCMake.CMP0052 test
We do not need to enable any languages for these tests.
diff --git a/Tests/RunCMake/CMP0052/CMakeLists.txt b/Tests/RunCMake/CMP0052/CMakeLists.txt
index 2f10cb0..1c39221 100644
--- a/Tests/RunCMake/CMP0052/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0052/CMakeLists.txt
@@ -1,3 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
-project(${RunCMake_TEST} CXX)
+cmake_minimum_required(VERSION 3.0)
+project(${RunCMake_TEST} NONE)
include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37435201469a91fe222c7aa87df07dedf7124eab
commit 37435201469a91fe222c7aa87df07dedf7124eab
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 26 08:58:45 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 26 08:59:25 2014 -0500
Utilities/Release: Use ${VAR} instead of @VAR@ syntax
The Utilities/Release/Cygwin/CMakeLists.txt is processed in the project,
not configured, so we should avoid using @-replacement syntax.
diff --git a/Utilities/Release/Cygwin/CMakeLists.txt b/Utilities/Release/Cygwin/CMakeLists.txt
index c59a6fa..73a8220 100644
--- a/Utilities/Release/Cygwin/CMakeLists.txt
+++ b/Utilities/Release/Cygwin/CMakeLists.txt
@@ -14,9 +14,9 @@ message(STATUS "Using curses version: libncurses${MAX}")
configure_file("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/cygwin-setup.hint.in"
"${CMake_BINARY_DIR}/setup.hint")
configure_file("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/README.cygwin.in"
- "${CMake_BINARY_DIR}/Docs/@CPACK_PACKAGE_FILE_NAME at -@CPACK_CYGWIN_PATCH_NUMBER at .README")
+ "${CMake_BINARY_DIR}/Docs/${CPACK_PACKAGE_FILE_NAME}-${CPACK_CYGWIN_PATCH_NUMBER}.README")
install_files(/share/doc/Cygwin FILES
- ${CMake_BINARY_DIR}/Docs/@CPACK_PACKAGE_FILE_NAME at -@CPACK_CYGWIN_PATCH_NUMBER at .README
+ ${CMake_BINARY_DIR}/Docs/${CPACK_PACKAGE_FILE_NAME}-${CPACK_CYGWIN_PATCH_NUMBER}.README
)
configure_file("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/cygwin-package.sh.in"
${CPACK_CYGWIN_BUILD_SCRIPT})
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CMP0052/CMakeLists.txt | 4 ++--
Utilities/Release/Cygwin/CMakeLists.txt | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list