[Cmake-commits] CMake branch, next, updated. v2.8.5-1738-g30672a3

[David Cole]

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  30672a368a06f2f0dbd507d68c96fad16d93bfd8 (commit)
       via  4a679a9f160a26bead7f54166272a5604cefcce6 (commit)
      from  0a128f6bfa4b1d7db3cbfc3d091cc9a02e2a619f (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=30672a368a06f2f0dbd507d68c96fad16d93bfd8
commit 30672a368a06f2f0dbd507d68c96fad16d93bfd8
Merge: 0a128f6 4a679a9
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 26 15:02:59 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 26 15:02:59 2011 -0400

    Merge topic 'adjust-release-scripts' into next
    
    4a679a9 CMake Release Scripts: Changes for next release candidate...


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a679a9f160a26bead7f54166272a5604cefcce6
commit 4a679a9f160a26bead7f54166272a5604cefcce6
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Aug 22 18:05:30 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Aug 26 15:00:55 2011 -0400

    CMake Release Scripts: Changes for next release candidate...
    
    Removed script for dashsun1: machine is now defunct. R.I.P.
    
    Added new script for 64-bit universal binary build on
    dashmacmini5 with x86_64;i386

diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index 75b0061..c304e67 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -7,9 +7,9 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs)
 
 set(RELEASE_SCRIPTS_BATCH_1
   dash2win64_release.cmake    # Windows
-  dashmacmini2_release.cmake  # Mac Darwin universal
+  dashmacmini2_release.cmake  # Mac Darwin universal ppc;i386
+  dashmacmini5_release.cmake  # Mac Darwin64 universal x86_64;i386
   magrathea_release.cmake     # Linux
-  dashsun1_release.cmake      # SunOS
   v20n250_aix_release.cmake   # AIX 5.3
   ferrari_sgi64_release.cmake # IRIX 64
   ferrari_sgi_release.cmake   # IRIX
diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake
index d117014..2668d38 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -12,7 +12,7 @@ CMAKE_BUILD_TYPE:STRING=Release
 CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
 CPACK_SYSTEM_NAME:STRING=Darwin-universal
-BUILD_QtDialog:BOOL:=TRUE
+BUILD_QtDialog:BOOL=TRUE
 QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Software/QtBinUniversal/bin/qmake
 ")
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake
new file mode 100644
index 0000000..92eebd7
--- /dev/null
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -0,0 +1,20 @@
+set(PROCESSORS 4)
+set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory)
+# set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc  <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES>  -shared-libgcc -lstdc++-static\\\")")
+set(INSTALL_PREFIX /)
+set(HOST dashmacmini5)
+set(MAKE_PROGRAM "make")
+set(MAKE "${MAKE_PROGRAM} -j5")
+set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ")
+set(CPACK_SOURCE_GENERATORS "TGZ TZ")
+set(INITIAL_CACHE "
+CMAKE_BUILD_TYPE:STRING=Release
+CMAKE_OSX_ARCHITECTURES:STRING=x86_64;i386
+CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.5
+CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
+CPACK_SYSTEM_NAME:STRING=Darwin64-universal
+BUILD_QtDialog:BOOL=TRUE
+QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.6.4/install/bin/qmake
+")
+get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
+include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/dashsun1_release.cmake b/Utilities/Release/dashsun1_release.cmake
deleted file mode 100644
index f98795d..0000000
--- a/Utilities/Release/dashsun1_release.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-set(PROCESSORS 1)
-set(HOST dashsun1)
-set(CMAKE_RELEASE_DIRECTORY "/home/kitware/CMakeReleaseDirectory" )
-set(MAKE_PROGRAM "make")
-set(USER_MAKE_RULE_FILE
-  "/home/kitware/CMakeReleaseDirectory/UserMakeRules.cmake")
-set(INITIAL_CACHE "
-CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
-CMAKE_BUILD_TYPE:STRING=Release
-HAVE_LIBDL:INTERNAL=FALSE
-CMAKE_EXE_LINKER_FLAGS:STRING=-Bdynamic -ldl -Bstatic
-CMAKE_USER_MAKE_RULES_OVERRIDE:STRING=${USER_MAKE_RULE_FILE}
-CURSES_LIBRARY:FILEPATH=/usr/lib/libcurses.a
-FORM_LIBRARY:FILEPATH=/usr/lib/libform.a")
-set(USER_MAKE_RULE_FILE_CONTENTS
-  "SET(CMAKE_DL_LIBS \\\"-Bdynamic -ldl -Bstatic\\\")")
-get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
-include(${path}/release_cmake.cmake)

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Release/create-cmake-release.cmake |    4 ++--
 Utilities/Release/dashmacmini2_release.cmake |    2 +-
 Utilities/Release/dashmacmini5_release.cmake |   20 ++++++++++++++++++++
 Utilities/Release/dashsun1_release.cmake     |   18 ------------------
 4 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 Utilities/Release/dashmacmini5_release.cmake
 delete mode 100644 Utilities/Release/dashsun1_release.cmake


hooks/post-receive
-- 
CMake