Bill Hoffman 18 лет назад
Родитель
Сommit
fcce2f3b61

+ 2 - 1
Utilities/Release/create-cmake-release.cmake

@@ -10,8 +10,9 @@ set(RELEASE_SCRIPTS
   dashsgi1_release.cmake      # IRIX
   dashsgi1_release64.cmake    # IRIX 64
   vogon_release.cmake         # Windows
+  v20n17_aix_release.cmake    # AIX 5.3
   vogon_cygwin.cmake          # Cygwin
-  r36n11_aix_release.cmake    # AIX 5.3
+#  r36n11_aix_release.cmake    # AIX 5.3
 #  r15n65_aix_release.cmake    # AIX 5.2
 )
 

+ 3 - 0
Utilities/Release/dashmacmini2_release.cmake

@@ -1,4 +1,5 @@
 set(PROCESSORS 2)
+set(INSTALL_PREFIX /)
 set(HOST dashmacmini2)
 set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j2")
@@ -9,6 +10,8 @@ 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
+QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Software/QtBinUniversal/bin/qmake
 ")
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 include(${path}/release_cmake.cmake)

+ 2 - 0
Utilities/Release/magrathea_release.cmake

@@ -8,6 +8,8 @@ CURSES_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libncurses.a
 CURSES_INCLUDE_PATH:PATH=/usr/i686-gcc-332s/include/ncurses
 FORM_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libform.a
 CPACK_SYSTEM_NAME:STRING=Linux-i386
+BUILD_QtDialog:BOOL:=TRUE
+QT_QMAKE_EXECUTABLE:FILEPATH=/home/kitware/qt-x11-opensource-src-4.3.3-install/bin/qmake
 ")
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 include(${path}/release_cmake.cmake)

+ 9 - 3
Utilities/Release/release_cmake.sh.in

@@ -79,9 +79,15 @@ if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then
     @CMAKE_CONFIGURE_PATH@ ../@CMAKE_VERSION@
     check_exit_value $? "Configure cmake" || exit 1
 else
-    echo  "Run cmake bootstrap --parallel=@PROCESSORS@"
-    ../@CMAKE_VERSION@/bootstrap --parallel=@PROCESSORS@
-    check_exit_value $? "Bootstrap cmake" || exit 1
+    if [ -z "@INSTALL_PREFIX@" ]; then
+	echo  "Run cmake bootstrap --parallel=@PROCESSORS@"
+	../@CMAKE_VERSION@/bootstrap --parallel=@PROCESSORS@
+	check_exit_value $? "Bootstrap cmake" || exit 1
+    else
+	echo  "Run cmake bootstrap --prefix=@INSTALL_PREFIX@ --parallel=@PROCESSORS@"
+	../@CMAKE_VERSION@/bootstrap --prefix=@INSTALL_PREFIX@ --parallel=@PROCESSORS@
+	check_exit_value $? "Bootstrap cmake" || exit 1
+    fi
 fi
 
 echo "Build cmake with @MAKE@"