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

BUG: Rename Bootstrap directory to Bootstrap.cmk, so that on platforms such as Windows and Mac OSX it will break during in-source build

This commit is contained in:
Andy Cedilnik 2003-04-17 08:02:44 -04:00
parent 65422964f7
commit 1181ac5ee7
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -34,9 +34,9 @@ ENABLE_TESTING()
# Include the standard Dart testing module # Include the standard Dart testing module
INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
INCLUDE (${CMake_BINARY_DIR}/Bootstrap/Source/InitialConfigureFlags.cmake INCLUDE (${CMake_BINARY_DIR}/Bootstrap.cmk/Source/InitialConfigureFlags.cmake
OPTIONAL) OPTIONAL)
INCLUDE (${CMake_BINARY_DIR}/Bootstrap/InitialConfigureFlags.cmake INCLUDE (${CMake_BINARY_DIR}/Bootstrap.cmk/InitialConfigureFlags.cmake
OPTIONAL) OPTIONAL)
IF(CMAKE_CONFIGURE_INSTALL_PREFIX) IF(CMAKE_CONFIGURE_INSTALL_PREFIX)

4
bootstrap
View File

@ -30,7 +30,7 @@ CMAKE_SOURCES="\
cmake_source_dir=`echo $0 | sed -n '/\//{s/\/[^\/]*$//;p;}'` cmake_source_dir=`echo $0 | sed -n '/\//{s/\/[^\/]*$//;p;}'`
cmake_source_dir=`(cd "${cmake_source_dir}";pwd)` cmake_source_dir=`(cd "${cmake_source_dir}";pwd)`
cmake_binary_dir=`pwd` cmake_binary_dir=`pwd`
cmake_bootstrap_dir="${cmake_binary_dir}/Bootstrap" cmake_bootstrap_dir="${cmake_binary_dir}/Bootstrap.cmk"
cmake_usage() cmake_usage()
{ {
@ -316,7 +316,7 @@ for a in ${CMAKE_SOURCES}; do
echo " ${cmake_cxx_compiler} ${cmake_cxx_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile" echo " ${cmake_cxx_compiler} ${cmake_cxx_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
done done
# Write prefix to Bootstrap/InitialConfigureFlags.cmake # Write prefix to Bootstrap.cmk/InitialConfigureFlags.cmake
echo "SET (CMAKE_CONFIGURE_INSTALL_PREFIX \"${cmake_prefix_dir}\" CACHE PATH \"Install path prefix, prepended onto install directories, For CMake this will always override CMAKE_INSTALL_PREFIX in the cache.\")" > "${cmake_bootstrap_dir}/InitialConfigureFlags.cmake" echo "SET (CMAKE_CONFIGURE_INSTALL_PREFIX \"${cmake_prefix_dir}\" CACHE PATH \"Install path prefix, prepended onto install directories, For CMake this will always override CMAKE_INSTALL_PREFIX in the cache.\")" > "${cmake_bootstrap_dir}/InitialConfigureFlags.cmake"
echo "---------------------------------------------" echo "---------------------------------------------"

10
configure vendored
View File

@ -1681,23 +1681,23 @@ $RUNMAKE
else else
PRGNAME=configure # Should be `basename $0` PRGNAME=configure # Should be `basename $0`
DIRNAME=Bootstrap DIRNAME=Bootstrap.cmk
# Check if the bootstrap directory already exists. # Check if the bootstrap directory already exists.
if test -d Bootstrap; then if test -d ${DIRNAME}; then
: :
else else
# if it does not create one # if it does not create one
mkdir Bootstrap mkdir ${DIRNAME}
fi fi
if ( if (
# Build bootstrap cmake # Build bootstrap cmake
cd Bootstrap cd ${DIRNAME}
echo "Bootstrapping to directory `pwd`" echo "Bootstrapping to directory `pwd`"
BUILD_CMAKE_IN_SUBDIR=true $CMAKE_ROOT_DIR/$PRGNAME $ac_configure_args BUILD_CMAKE_IN_SUBDIR=true $CMAKE_ROOT_DIR/$PRGNAME $ac_configure_args
); then ); then
# run cmake # run cmake
Bootstrap/Source/cmake $fullSrcDir ${DIRNAME}/Source/cmake $fullSrcDir
# run cmake depends # run cmake depends
$RUNMAKE depend $RUNMAKE depend

10
configure.in
View File

@ -213,23 +213,23 @@ $RUNMAKE
else else
PRGNAME=configure # Should be `basename $0` PRGNAME=configure # Should be `basename $0`
DIRNAME=Bootstrap DIRNAME=Bootstrap.cmk
# Check if the bootstrap directory already exists. # Check if the bootstrap directory already exists.
if test -d Bootstrap; then if test -d ${DIRNAME}; then
: :
else else
# if it does not create one # if it does not create one
mkdir Bootstrap mkdir ${DIRNAME}
fi fi
if ( if (
# Build bootstrap cmake # Build bootstrap cmake
cd Bootstrap cd ${DIRNAME}
echo "Bootstrapping to directory `pwd`" echo "Bootstrapping to directory `pwd`"
BUILD_CMAKE_IN_SUBDIR=true $CMAKE_ROOT_DIR/$PRGNAME $ac_configure_args BUILD_CMAKE_IN_SUBDIR=true $CMAKE_ROOT_DIR/$PRGNAME $ac_configure_args
); then ); then
# run cmake # run cmake
Bootstrap/Source/cmake $fullSrcDir ${DIRNAME}/Source/cmake $fullSrcDir
# run cmake depends # run cmake depends
$RUNMAKE depend $RUNMAKE depend