diff --git a/Utilities/cmake_release_config_linux b/Utilities/cmake_release_config_linux index 8c6af7c46..4fca09d16 100644 --- a/Utilities/cmake_release_config_linux +++ b/Utilities/cmake_release_config_linux @@ -1,5 +1,15 @@ RELEASE_TAG="Release-1-4" VERSION="1.4" -PLATFORM="x86-linux" +PLATFORM="x86-linux-static" CREATE_SOURCE_TARBALL="yes" +CURSES_LIBRARY="/usr/lib/libcurses.a" +FORM_LIBRARY="/usr/lib/libform.a" + +CMAKE_CACHE_ENTRIES=" +CMAKE_CXX_SHLIB_LINK_FLAGS:STRING=-static +CMAKE_CXX_SHLIB_BUILD_FLAGS:STRING= +CMAKE_CXX_SHLIB_RUNTIME_FLAG:STRING= +CURSES_LIBRARY:FILEPATH=${CURSES_LIBRARY} +FORM_LIBRARY:FILEPATH=${FORM_LIBRARY} +" diff --git a/Utilities/cmake_release_unix.sh b/Utilities/cmake_release_unix.sh index 71c5683a7..51cbcb623 100755 --- a/Utilities/cmake_release_unix.sh +++ b/Utilities/cmake_release_unix.sh @@ -22,9 +22,6 @@ fi # Set some defaults here. They can be changed by the configuration # file. CVSROOT=":pserver:anonymous@www.cmake.org:/cvsroot/CMake" -CURSES_LIBRARY="/usr/lib/libcurses.a" -FORM_LIBRARY="/usr/lib/libform.a" -STATIC_LINK_FLAGS="-static" RELEASE_ROOT=`pwd` CREATE_SOURCE_TARBALL="no" CMAKE="cmake" @@ -39,6 +36,7 @@ CC="gcc" CXX="c++" CFLAGS="" CXXFLAGS="" +CMAKE_CACHE_ENTRIES="" #----------------------------------------------------------------------------- # Configuration options (could be in separate file) @@ -54,7 +52,7 @@ export CC CXX CFLAGS CXXFLAGS # Select directories. INSTALL_DIR="${RELEASE_ROOT}/Install" TARBALL_DIR="${RELEASE_ROOT}/Tarballs" -BUILD_DIR="${RELEASE_ROOT}/CMake-$VERSION-static" +BUILD_DIR="${RELEASE_ROOT}/CMake-$VERSION-$PLATFORM-build" LOG_DIR="${RELEASE_ROOT}/Logs" # Cleanup from possible previous run. @@ -97,14 +95,10 @@ fi # Build the release. cd ${BUILD_DIR} echo "Writing CMakeCache.txt..." -${CAT} >> CMakeCache.txt < CMakeCache.txt <> README < ${LOG_DIR}/CMake$VERSION-$PLATFORM-static.log 2>&1 ; then : ; else - "Error, see ${LOG_DIR}/CMake$VERSION-$PLATFORM-static.log" + > ${LOG_DIR}/CMake$VERSION-$PLATFORM.log 2>&1 ; then : ; else + "Error, see ${LOG_DIR}/CMake$VERSION-$PLATFORM.log" exit 1 fi