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

BUG: fix depends and CXXFLAGS passing

This commit is contained in:
Bill Hoffman 2001-05-22 13:22:30 -04:00
parent 69503c66eb
commit beaa7dc1c8
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Makefile.in
View File

@ -3,7 +3,7 @@ VPATH = @srcdir@
CMAKE_CONFIG_DIR = @CMAKE_CONFIG_DIR@ CMAKE_CONFIG_DIR = @CMAKE_CONFIG_DIR@
CXX = @CXX@ CXX = @CXX@
CXXFLAGS = -DCMAKE_ROOT_DIR='"@CMAKE_ROOT_DIR@"' @CXXFLAGS@ -DCMAKE_HAS_AUTOCONF -I${CMAKE_CONFIG_DIR}/Source CXXFLAGS = @CXXFLAGS@ -DCMAKE_ROOT_DIR='"@CMAKE_ROOT_DIR@"' @CXXFLAGS@ -DCMAKE_HAS_AUTOCONF -I${CMAKE_CONFIG_DIR}/Source
.SUFFIXES: .cxx .java .class .SUFFIXES: .cxx .java .class

5
Source/cmUnixMakefileGenerator.cxx
View File

@ -133,11 +133,10 @@ void cmUnixMakefileGenerator::OutputMakefile(const char* file)
this->OutputDependencies(fout); this->OutputDependencies(fout);
this->OutputTargets(fout); this->OutputTargets(fout);
this->OutputSubDirectoryRules(fout); this->OutputSubDirectoryRules(fout);
std::string dependName; std::string dependName = m_Makefile->GetStartOutputDirectory();
dependName += "/cmake.depends";
if(!this->m_CacheOnly) if(!this->m_CacheOnly)
{ {
dependName = m_Makefile->GetStartOutputDirectory();
dependName += "/cmake.depends";
std::ofstream dependout(dependName.c_str()); std::ofstream dependout(dependName.c_str());
if(!dependout) if(!dependout)
{ {

13
Templates/configure vendored
View File

@ -2810,6 +2810,10 @@ case $system in
CMAKE_USE_PTHREADS=0 CMAKE_USE_PTHREADS=0
CMAKE_THREAD_LIBS="" CMAKE_THREAD_LIBS=""
;; ;;
CYGWIN_NT*)
CMAKE_THREAD_LIBS=""
CMAKE_USE_PTHREADS=0
;;
esac esac
fi fi
@ -2819,7 +2823,6 @@ fi
CMAKE_ANSI_CFLAGS="" CMAKE_ANSI_CFLAGS=""
# on hp use -Aa for ansi # on hp use -Aa for ansi
if test $ac_cv_prog_gxx = no; then if test $ac_cv_prog_gxx = no; then
@ -2867,7 +2870,7 @@ fi
# ansi stream files (without the .h) # ansi stream files (without the .h)
if test $ac_cv_prog_gxx = no; then if test $ac_cv_prog_gxx = no; then
echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6 echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6
echo "configure:2871: checking ansi standard C++ stream headers " >&5 echo "configure:2874: checking ansi standard C++ stream headers " >&5
echo "******" echo "******"
rm -rf conftest.* rm -rf conftest.*
cat > conftest.cc <<! cat > conftest.cc <<!
@ -2888,7 +2891,7 @@ fi
if test $ac_cv_prog_gxx = no; then if test $ac_cv_prog_gxx = no; then
echo "******" echo "******"
echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6 echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6
echo "configure:2892: checking ansi standard namespace support " >&5 echo "configure:2895: checking ansi standard namespace support " >&5
rm -rf conftest.* rm -rf conftest.*
cat > conftest.cc <<! cat > conftest.cc <<!
#include <list> #include <list>
@ -2916,7 +2919,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2920: checking for $ac_word" >&5 echo "configure:2923: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RUNMAKE'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_RUNMAKE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -2956,7 +2959,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2960: checking for $ac_word" >&5 echo "configure:2963: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CMAKE_AR'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_CMAKE_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else

5
Templates/configure.in
View File

@ -387,10 +387,13 @@ case $system in
CMAKE_USE_PTHREADS=0 CMAKE_USE_PTHREADS=0
CMAKE_THREAD_LIBS="" CMAKE_THREAD_LIBS=""
;; ;;
CYGWIN_NT*)
CMAKE_THREAD_LIBS=""
CMAKE_USE_PTHREADS=0
;;
esac esac
fi fi
AC_SUBST(CMAKE_USE_SPROC) AC_SUBST(CMAKE_USE_SPROC)
AC_SUBST(CMAKE_USE_PTHREADS) AC_SUBST(CMAKE_USE_PTHREADS)
AC_SUBST(CMAKE_HP_PTHREADS) AC_SUBST(CMAKE_HP_PTHREADS)