kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2016-02-18 15:32:38 -05:00
parent 9f40f65666
commit b682debd65
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/CMakeLists.txt
View File

@ -687,7 +687,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
dash3win7_release.cmake) dash3win7_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
dashmacmini5_release.cmake) bigmac_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32 ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32
magrathea_release.cmake) magrathea_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64 ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64

21
Utilities/Release/dashmacmini5_release.cmake → Utilities/Release/bigmac_release.cmake
View File

@ -1,27 +1,32 @@
set(PROCESSORS 4) set(PROCESSORS 4)
set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory) 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(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake")
set(HOST dashmacmini5) set(HOST bigmac)
set(MAKE_PROGRAM "make") set(MAKE_PROGRAM "make")
set(MAKE "${MAKE_PROGRAM} -j5") set(MAKE "${MAKE_PROGRAM} -j5")
set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ") set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ")
set(CPACK_SOURCE_GENERATORS "TGZ TZ") set(CPACK_SOURCE_GENERATORS "TGZ TZ")
set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size 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 " 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_BUILD_TYPE:STRING=Release
CMAKE_OSX_ARCHITECTURES:STRING=x86_64 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 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
CPACK_SYSTEM_NAME:STRING=Darwin-x86_64 CPACK_SYSTEM_NAME:STRING=Darwin-x86_64
BUILD_QtDialog:BOOL=TRUE BUILD_QtDialog:BOOL=TRUE
CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
CMake_INSTALL_DEPENDENCIES:BOOL=ON 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) get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
include(${path}/release_cmake.cmake) include(${path}/release_cmake.cmake)

2
Utilities/Release/create-cmake-release.cmake
View File

@ -7,7 +7,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs)
set(RELEASE_SCRIPTS_BATCH_1 set(RELEASE_SCRIPTS_BATCH_1
dash3win7_release.cmake # Windows dash3win7_release.cmake # Windows
dashmacmini5_release.cmake # OS X x86_64 bigmac_release.cmake # OS X x86_64
magrathea_release.cmake # Linux magrathea_release.cmake # Linux
linux64_release.cmake # Linux x86_64 linux64_release.cmake # Linux x86_64
) )