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

Merge topic 'nightly-binary-updates'

Browse Source 
202056cd Utilities/Release: Build Windows and OS X binaries with native SSL
d64caa53 Utilities/Release: Fix name of OS X 10.6+ x86_64-only binary
This commit is contained in:
Brad King 2014-12-22 09:59:09 -05:00 committed by CMake Topic Stage
commit d760c3cbe8
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Utilities/Release/dash2win64_release.cmake
View File

@ -7,8 +7,13 @@ set(CPACK_BINARY_GENERATORS "NSIS ZIP")
set(CPACK_SOURCE_GENERATORS "ZIP") set(CPACK_SOURCE_GENERATORS "ZIP")
set(MAKE_PROGRAM "make") set(MAKE_PROGRAM "make")
set(MAKE "${MAKE_PROGRAM} -j8") set(MAKE "${MAKE_PROGRAM} -j8")
if(CMAKE_CREATE_VERSION STREQUAL "nightly")
set(CMAKE_USE_OPENSSL OFF)
else()
set(CMAKE_USE_OPENSSL ON)
endif()
set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
CMAKE_USE_OPENSSL:BOOL=ON CMAKE_USE_OPENSSL:BOOL=${CMAKE_USE_OPENSSL}
CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
CMAKE_Fortran_COMPILER:FILEPATH=FALSE CMAKE_Fortran_COMPILER:FILEPATH=FALSE
CMAKE_GENERATOR:INTERNAL=Unix Makefiles CMAKE_GENERATOR:INTERNAL=Unix Makefiles

11
Utilities/Release/dashmacmini5_release.cmake
View File

@ -8,16 +8,21 @@ 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
if(CMAKE_CREATE_VERSION STREQUAL "nightly")
set(CMAKE_USE_OPENSSL OFF)
else()
set(CMAKE_USE_OPENSSL ON)
endif()
set(INITIAL_CACHE " set(INITIAL_CACHE "
CMAKE_USE_OPENSSL:BOOL=ON CMAKE_USE_OPENSSL:BOOL=${CMAKE_USE_OPENSSL}
OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a 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_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 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.5 CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6
CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
CPACK_SYSTEM_NAME:STRING=Darwin64-universal 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
QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.8.0/install/bin/qmake QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.8.0/install/bin/qmake