Merge topic 'release-no-old-osx'
992c43d2
Tests: Rename OS X nightly release binary test45fa326b
Utilities/Release: Drop OS X ppc/i386 binary9cbab63e
Tests: Drop nightly OS X ppc/i386 binary
This commit is contained in:
commit
fab711a87a
|
@ -687,9 +687,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
|
||||||
if(CMAKE_BUILD_NIGHTLY_RELEASES)
|
if(CMAKE_BUILD_NIGHTLY_RELEASES)
|
||||||
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
|
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
|
||||||
dash2win64_release.cmake)
|
dash2win64_release.cmake)
|
||||||
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyMac
|
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
|
||||||
dashmacmini2_release.cmake)
|
|
||||||
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyMac64
|
|
||||||
dashmacmini5_release.cmake)
|
dashmacmini5_release.cmake)
|
||||||
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux
|
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux
|
||||||
magrathea_release.cmake)
|
magrathea_release.cmake)
|
||||||
|
|
|
@ -7,8 +7,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs)
|
||||||
|
|
||||||
set(RELEASE_SCRIPTS_BATCH_1
|
set(RELEASE_SCRIPTS_BATCH_1
|
||||||
dash2win64_release.cmake # Windows
|
dash2win64_release.cmake # Windows
|
||||||
dashmacmini2_release.cmake # Mac Darwin universal ppc;i386
|
dashmacmini5_release.cmake # OS X x86_64
|
||||||
dashmacmini5_release.cmake # Mac Darwin64 universal x86_64;i386
|
|
||||||
magrathea_release.cmake # Linux
|
magrathea_release.cmake # Linux
|
||||||
linux64_release.cmake # Linux x86_64
|
linux64_release.cmake # Linux x86_64
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
set(PROCESSORS 2)
|
|
||||||
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(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
|
|
||||||
set(HOST dashmacmini2)
|
|
||||||
set(MAKE_PROGRAM "make")
|
|
||||||
set(MAKE "${MAKE_PROGRAM} -j2")
|
|
||||||
set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
|
|
||||||
set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size
|
|
||||||
set(INITIAL_CACHE "
|
|
||||||
CMAKE_BUILD_TYPE:STRING=Release
|
|
||||||
CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
|
|
||||||
CMAKE_USE_OPENSSL:BOOL=ON
|
|
||||||
OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a
|
|
||||||
OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1g-install/include
|
|
||||||
OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libssl.a
|
|
||||||
CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
|
|
||||||
CPACK_SYSTEM_NAME:STRING=Darwin-universal
|
|
||||||
BUILD_QtDialog:BOOL=TRUE
|
|
||||||
CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
|
|
||||||
CMake_INSTALL_DEPENDENCIES:BOOL=ON
|
|
||||||
QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.8.0/install/bin/qmake
|
|
||||||
")
|
|
||||||
get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
|
||||||
include(${path}/release_cmake.cmake)
|
|
Loading…
Reference in New Issue