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

ENH: Fix checking for C++ compiler on Mac, remove cmConfigure.h.tmp, so that nothing bad can happen if configure is interrupted, reports kwsys sources in cmConfigure.h

Browse Source
This commit is contained in:
Andy Cedilnik 2003-06-30 09:56:33 -04:00
parent d24b9feaf3
commit 81c2f420d8
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bootstrap
View File

@ -177,6 +177,10 @@ cmake_try_run ()
fi fi
TMPFILE=`cmake_tmp_file` TMPFILE=`cmake_tmp_file`
echo "Try: ${COMPILER}" echo "Try: ${COMPILER}"
echo "Line: ${COMPILER} ${FLAGS} ${TESTFILE} -o ${TMPFILE}"
echo "---------- file -----------------------"
cat ${TESTFILE}
echo "------------------------------------------"
"${COMPILER}" ${FLAGS} "${TESTFILE}" -o "${TMPFILE}" "${COMPILER}" ${FLAGS} "${TESTFILE}" -o "${TMPFILE}"
RES=$? RES=$?
if [ "${RES}" -ne "0" ]; then if [ "${RES}" -ne "0" ]; then
@ -281,6 +285,7 @@ fi
# Delete all the bootstrap files # Delete all the bootstrap files
rm -f "${cmake_bootstrap_dir}/cmake_bootstrap.log" rm -f "${cmake_bootstrap_dir}/cmake_bootstrap.log"
rm -f "${cmake_bootstrap_dir}/cmConfigure.h.tmp"
# If exist compiler flags, set them # If exist compiler flags, set them
cmake_c_flags=${CFLAGS} cmake_c_flags=${CFLAGS}
@ -322,6 +327,8 @@ echo "C compiler on this system is: ${cmake_c_compiler} ${cmake_c_flags}"
# Test CXX compiler # Test CXX compiler
cmake_cxx_compiler= cmake_cxx_compiler=
# On Mac OSX, CC is the same as cc, so make sure not to try CC as c++ compiler.
# If CC is set, use that for compiler, otherwise use list of known compilers # If CC is set, use that for compiler, otherwise use list of known compilers
if [ -n "${CXX}" ]; then if [ -n "${CXX}" ]; then
cmake_cxx_compilers="${CXX}" cmake_cxx_compilers="${CXX}"
@ -333,10 +340,18 @@ fi
TMPFILE=`cmake_tmp_file` TMPFILE=`cmake_tmp_file`
cat>"${TMPFILE}.cxx"<<EOF cat>"${TMPFILE}.cxx"<<EOF
#include <stdio.h> #include <stdio.h>
class NeedCXX {}; class NeedCXX
{
public:
NeedCXX() { this->Foo = 1; }
int GetFoo() { return this->Foo; }
private:
int Foo;
};
int main() int main()
{ {
printf("1\n"); NeedCXX c;
printf("%d\n", c.GetFoo());
return 0; return 0;
} }
EOF EOF
@ -479,6 +494,8 @@ cmake_report cmConfigure.h.tmp " * Make: ${cmake_make_processor}"
cmake_report cmConfigure.h.tmp " *" cmake_report cmConfigure.h.tmp " *"
cmake_report cmConfigure.h.tmp " * Sources:" cmake_report cmConfigure.h.tmp " * Sources:"
cmake_report cmConfigure.h.tmp " * ${CMAKE_SOURCES}" cmake_report cmConfigure.h.tmp " * ${CMAKE_SOURCES}"
cmake_report cmConfigure.h.tmp " * kwSys Sources:"
cmake_report cmConfigure.h.tmp " * ${KWSYS_SOURCES}"
cmake_report cmConfigure.h.tmp " */" cmake_report cmConfigure.h.tmp " */"
# Test for STD namespace # Test for STD namespace