[Cmake-commits] CMake branch, next, updated. v3.5.0-486-g5048106
Brad King
brad.king at kitware.com
Wed Mar 16 16:43:37 EDT 2016
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 50481066778a343c855a1a6f0ed192032b1c1d91 (commit)
via 38c1923b9b6409509b7795cd6a7d0c9b4a93a7a6 (commit)
via 27ce586828a517169af3a8d20f5239d8e342bf36 (commit)
from 915f223aafe79b19c53cff12bdba9e9d11756cd0 (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=50481066778a343c855a1a6f0ed192032b1c1d91
commit 50481066778a343c855a1a6f0ed192032b1c1d91
Merge: 915f223 38c1923
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 16 16:43:35 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 16 16:43:35 2016 -0400
Merge topic 'release-win64' into next
38c1923b Utilities/Release: Create a Windows 64-bit binary
27ce5868 Utilities/Release: Rename scripts to match target platform
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38c1923b9b6409509b7795cd6a7d0c9b4a93a7a6
commit 38c1923b9b6409509b7795cd6a7d0c9b4a93a7a6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 16 16:42:39 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 16 16:42:39 2016 -0400
Utilities/Release: Create a Windows 64-bit binary
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c14008f..8a256bf 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -686,12 +686,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
if(CMAKE_BUILD_NIGHTLY_RELEASES)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin32
win32_release.cmake)
+ ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin64
+ win64_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
osx_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32
linux32_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64
linux64_release.cmake)
+ set_property(TEST CMakeNightlyWin64 PROPERTY DEPENDS CMakeNightlyWin32)
endif()
# add tests with more complex invocations
diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index 99918b7..9abd784 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -14,6 +14,7 @@ set(RELEASE_SCRIPTS_BATCH_1
set(RELEASE_SCRIPTS_BATCH_2
dash2win64_cygwin.cmake # Cygwin
+ win64_release.cmake # Windows x64
)
function(write_batch_shell_script filename)
diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake
new file mode 100644
index 0000000..f148e42
--- /dev/null
+++ b/Utilities/Release/win64_release.cmake
@@ -0,0 +1,28 @@
+set(CMAKE_RELEASE_DIRECTORY "c:/msys64/home/dashboard/CMakeReleaseDirectory64")
+set(CONFIGURE_WITH_CMAKE TRUE)
+set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files\\ \\(x86\\)/CMake/bin/cmake.exe")
+set(PROCESSORS 8)
+set(HOST dash3win7)
+set(RUN_LAUNCHER ~/rel/run)
+set(CPACK_BINARY_GENERATORS "WIX ZIP")
+set(CPACK_SOURCE_GENERATORS "")
+set(MAKE_PROGRAM "ninja")
+set(MAKE "${MAKE_PROGRAM} -j8")
+set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
+CMAKE_DOC_DIR:STRING=doc/cmake
+CMAKE_USE_OPENSSL:BOOL=OFF
+CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
+CMAKE_Fortran_COMPILER:FILEPATH=FALSE
+CMAKE_GENERATOR:INTERNAL=Ninja
+BUILD_QtDialog:BOOL:=TRUE
+CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
+CMake_INSTALL_DEPENDENCIES:BOOL=ON
+CMAKE_EXE_LINKER_FLAGS:STRING=-machine:x64 -subsystem:console,5.01
+")
+set(ppflags "-D_WIN32_WINNT=0x501 -D_USING_V110_SDK71_")
+set(CFLAGS "${ppflags}")
+set(CXXFLAGS "${ppflags}")
+set(ENV ". ~/rel/env64")
+get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
+set(GIT_EXTRA "git config core.autocrlf true")
+include(${path}/release_cmake.cmake)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27ce586828a517169af3a8d20f5239d8e342bf36
commit 27ce586828a517169af3a8d20f5239d8e342bf36
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 16 16:40:24 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 16 16:40:24 2016 -0400
Utilities/Release: Rename scripts to match target platform
The machine name we happen to use for the build is less informative than
its platform.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 76ea5b4..c14008f 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -684,12 +684,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
endif()
endmacro()
if(CMAKE_BUILD_NIGHTLY_RELEASES)
- ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
- dash3win7_release.cmake)
+ ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin32
+ win32_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
- bigmac_release.cmake)
+ osx_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32
- magrathea_release.cmake)
+ linux32_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64
linux64_release.cmake)
endif()
diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index 403367b..99918b7 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -6,9 +6,9 @@ endif()
file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs)
set(RELEASE_SCRIPTS_BATCH_1
- dash3win7_release.cmake # Windows
- bigmac_release.cmake # OS X x86_64
- magrathea_release.cmake # Linux
+ win32_release.cmake # Windows x86
+ osx_release.cmake # OS X x86_64
+ linux32_release.cmake # Linux x86
linux64_release.cmake # Linux x86_64
)
diff --git a/Utilities/Release/magrathea_release.cmake b/Utilities/Release/linux32_release.cmake
similarity index 100%
rename from Utilities/Release/magrathea_release.cmake
rename to Utilities/Release/linux32_release.cmake
diff --git a/Utilities/Release/bigmac_release.cmake b/Utilities/Release/osx_release.cmake
similarity index 100%
rename from Utilities/Release/bigmac_release.cmake
rename to Utilities/Release/osx_release.cmake
diff --git a/Utilities/Release/dash3win7_release.cmake b/Utilities/Release/win32_release.cmake
similarity index 100%
rename from Utilities/Release/dash3win7_release.cmake
rename to Utilities/Release/win32_release.cmake
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 11 +++++++----
Utilities/Release/create-cmake-release.cmake | 7 ++++---
.../{magrathea_release.cmake => linux32_release.cmake} | 0
.../Release/{bigmac_release.cmake => osx_release.cmake} | 0
.../{dash3win7_release.cmake => win32_release.cmake} | 0
.../{dash3win7_release.cmake => win64_release.cmake} | 8 ++++----
6 files changed, 15 insertions(+), 11 deletions(-)
rename Utilities/Release/{magrathea_release.cmake => linux32_release.cmake} (100%)
rename Utilities/Release/{bigmac_release.cmake => osx_release.cmake} (100%)
copy Utilities/Release/{dash3win7_release.cmake => win32_release.cmake} (100%)
rename Utilities/Release/{dash3win7_release.cmake => win64_release.cmake} (87%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list