Merge from 1.8 branch.

This commit is contained in:
Brad King 2003-08-11 17:36:02 -04:00
parent ffd7c4d2a5
commit d6b9648ee3
5 changed files with 19 additions and 20 deletions

View File

@ -52,6 +52,9 @@ CXX=""
CFLAGS=""
CXXFLAGS=""
# Provide a default make.
MAKE=make
# Details of remote invocation.
[ -z "$REMOTE" ] && SELF="$0"
@ -366,10 +369,10 @@ configure()
config || return 1
[ -d "cmake-${VERSION}" ] || checkout || return 1
cache || return 1
echo "Running configure ..." &&
echo "Running bootstrap ..." &&
(
cd "cmake-${VERSION}-${PLATFORM}" &&
../cmake-${VERSION}/configure --prefix=${PREFIX}
../cmake-${VERSION}/bootstrap --prefix=${PREFIX}
) >Logs/configure.log 2>&1 || error_log Logs/configure.log
}
@ -384,7 +387,7 @@ build()
echo "Running make ..." &&
(
cd "cmake-${VERSION}-${PLATFORM}" &&
make
${MAKE}
) >Logs/build.log 2>&1 || error_log Logs/build.log
}
@ -398,7 +401,7 @@ tests()
(
cd "cmake-${VERSION}-${PLATFORM}" &&
rm -rf Tests &&
./Source/ctest -V
./bin/ctest -V
) >Logs/tests.log 2>&1 || error_log Logs/tests.log
}
@ -412,7 +415,7 @@ install()
(
rm -rf Install &&
cd "cmake-${VERSION}-${PLATFORM}" &&
make install DESTDIR="${RELEASE_ROOT}/Install"
${MAKE} install DESTDIR="${RELEASE_ROOT}/Install"
) >Logs/install.log 2>&1 || error_log Logs/install.log
}
@ -685,7 +688,7 @@ osx_install()
mkdir -p OSX/Resources/PostFlight &&
(
cd "cmake-${VERSION}-${PLATFORM}" &&
make install DESTDIR="${RELEASE_ROOT}/OSX/Package_Root"
${MAKE} install DESTDIR="${RELEASE_ROOT}/OSX/Package_Root"
) &&
cp cmake-${VERSION}/Copyright.txt OSX/Resources/License.txt &&
cp -r cmake-${VERSION}-${PLATFORM}/Source/CMake.app OSX/Package_Root/Applications &&

View File

@ -1,7 +1,7 @@
PLATFORM="darwin"
CC="cc"
CXX="c++"
WX_PREFIX=/Users/kitware/Andy/vtk/wx
WX_PREFIX=/Users/kitware/Software/wxBin
WX_RESOURCES=${WX_PREFIX}/lib/libwx_mac-2.3.rsrc
# Write entries into the cache file before building cmake.
@ -11,7 +11,7 @@ cat > CMakeCache.txt <<EOF
BUILD_TESTING:BOOL=ON
CURSES_LIBRARY:FILEPATH=/usr/local/lib/libncurses.a
CMAKE_BUILD_WX_DIALOG:BOOL=ON
CMAKE_WX_CONFIG:FILEPATH=${WX_PREFIX}/bin/wx-config
CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE:FILEPATH=${WX_PREFIX}/bin/wx-config
CMAKE_VERBOSE_MAKEFILE:BOOL=TRUE
EOF
}

View File

@ -1,21 +1,16 @@
PLATFORM="hpux-static"
CC="cc"
CXX="aCC"
CFLAGS="+DAportable"
CXXFLAGS="-Wl,+vnocompatwarnings +W740,749 +DAportable -D__HPACC_STRICTER_ANSI__"
PATH=/usr/local/bin:/usr/bin:/opt/ansic/bin:/usr/ccs/bin:/usr/contrib/bin:/opt/nettladm/bin:/opt/pd/bin:/opt/upgrade/bin:/usr/bin/X11:/usr/contrib/bin/X11:/opt/atok/bin:/opt/asx/bin/X11:/opt/xdevice/bin:/opt/egb/bin:/opt/vje/bin:/opt/resmon/bin:/opt/hparray/bin:/opt/langtools/bin:/opt/imake/bin:/opt/aCC/bin
# Write entries into the cache file before building cmake.
write_cache()
{
BINDIR=`pwd`
cat > UserMakeRules.cmake <<EOF
SET(CMAKE_DL_LIBS "")
EOF
cat > CMakeCache.txt <<EOF
BUILD_TESTING:BOOL=ON
CMAKE_EXE_LINKER_FLAGS:STRING=-ldld -Wl,-a,archive_shared
CMAKE_USER_MAKE_RULES_OVERRIDE:STRING=${BINDIR}/UserMakeRules.cmake
CMAKE_EXE_LINKER_FLAGS:STRING=-Wl,-a,archive_shared
CMAKE_SKIP_RPATH:BOOL=1
CMAKE_VERBOSE_MAKEFILE:BOOL=TRUE
EOF

View File

@ -1,6 +1,7 @@
PLATFORM="irix64"
CC="cc"
CXX="CC"
MAKE="gmake -j 20"
# Write entries into the cache file before building cmake.
write_cache()

View File

@ -1,8 +1,8 @@
PLATFORM="sparc-sunos57-static"
CURSES_LIBRARY="/usr/lib/libcurses.a"
FORM_LIBRARY="/usr/lib/libform.a"
CC="gcc"
CXX="c++"
CC="cc"
CXX="CC"
# Write entries into the cache file before building cmake.
write_cache()
@ -10,12 +10,12 @@ write_cache()
BINDIR=`pwd`
cat > UserMakeRules.cmake <<EOF
SET(CMAKE_DL_LIBS "")
SET(CMAKE_DL_LIBS "-Bdynamic -ldl -Bstatic")
EOF
cat > CMakeCache.txt <<EOF
BUILD_TESTING:BOOL=ON
CMAKE_EXE_LINKER_FLAGS:STRING=-Wl,-Bdynamic -ldl -Wl,-Bstatic
CMAKE_EXE_LINKER_FLAGS:STRING=-Bstatic
CMAKE_USER_MAKE_RULES_OVERRIDE:STRING=${BINDIR}/UserMakeRules.cmake
CMAKE_SKIP_RPATH:BOOL=1
CMAKE_VERBOSE_MAKEFILE:BOOL=TRUE