diff options
author | Brad King <brad.king@kitware.com> | 2016-02-18 20:32:38 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-02-19 20:47:18 (GMT) |
commit | b682debd65f07fb219a6a9c6b5fa5f42b468a845 (patch) | |
tree | ed2baea223b1cf9546a88fd07f042367ad0dc15f /Utilities | |
parent | 9f40f656660a791804e94a2a2a98ee89d7f9c70b (diff) | |
download | CMake-b682debd65f07fb219a6a9c6b5fa5f42b468a845.zip CMake-b682debd65f07fb219a6a9c6b5fa5f42b468a845.tar.gz CMake-b682debd65f07fb219a6a9c6b5fa5f42b468a845.tar.bz2 |
Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary
Use a new build machine to produce the OS X binary targeting OS X 10.7
and using Qt 5.5.
Diffstat (limited to 'Utilities')
-rw-r--r-- | Utilities/Release/bigmac_release.cmake (renamed from Utilities/Release/dashmacmini5_release.cmake) | 21 | ||||
-rw-r--r-- | Utilities/Release/create-cmake-release.cmake | 2 |
2 files changed, 14 insertions, 9 deletions
diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/bigmac_release.cmake index b147013..568a98c 100644 --- a/Utilities/Release/dashmacmini5_release.cmake +++ b/Utilities/Release/bigmac_release.cmake @@ -1,27 +1,32 @@ 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(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake") -set(HOST dashmacmini5) +set(HOST bigmac) set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j5") set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ") set(CPACK_SOURCE_GENERATORS "TGZ TZ") set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size +set(CC clang) +set(CXX clang++) +set(CFLAGS "") +set(CXXFLAGS "-stdlib=libc++") set(INITIAL_CACHE " -CMAKE_USE_OPENSSL:BOOL=OFF -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_BUILD_TYPE:STRING=Release CMAKE_OSX_ARCHITECTURES:STRING=x86_64 -CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 +CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CPACK_SYSTEM_NAME:STRING=Darwin-x86_64 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.6/install/bin/qmake +CMAKE_SKIP_RPATH:BOOL=TRUE +CMake_NO_C_STANDARD:BOOL=TRUE +CMake_NO_CXX_STANDARD:BOOL=TRUE +CMake_TEST_NO_FindPackageModeMakefileTest:BOOL=TRUE ") +set(ENV [[ +export CMAKE_PREFIX_PATH='/Users/kitware/dashboards/support/Qt-5.5.1' +]]) get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake index d41c4ec..403367b 100644 --- a/Utilities/Release/create-cmake-release.cmake +++ b/Utilities/Release/create-cmake-release.cmake @@ -7,7 +7,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs) set(RELEASE_SCRIPTS_BATCH_1 dash3win7_release.cmake # Windows - dashmacmini5_release.cmake # OS X x86_64 + bigmac_release.cmake # OS X x86_64 magrathea_release.cmake # Linux linux64_release.cmake # Linux x86_64 ) |