Merge topic 'adjust-release-scripts'
4a679a9
CMake Release Scripts: Changes for next release candidate...
This commit is contained in:
commit
f380278d91
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
|
@ -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)
|
Loading…
Reference in New Issue