Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CMake
CMake
Commits
beaa7dc1
Commit
beaa7dc1
authored
May 22, 2001
by
Bill Hoffman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: fix depends and CXXFLAGS passing
parent
69503c66
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
12 deletions
+17
-12
Source/Makefile.in
Source/Makefile.in
+1
-1
Source/cmUnixMakefileGenerator.cxx
Source/cmUnixMakefileGenerator.cxx
+2
-3
Templates/configure
Templates/configure
+9
-6
Templates/configure.in
Templates/configure.in
+5
-2
No files found.
Source/Makefile.in
View file @
beaa7dc1
...
...
@@ -3,7 +3,7 @@ VPATH = @srcdir@
CMAKE_CONFIG_DIR
=
@CMAKE_CONFIG_DIR@
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
...
...
Source/cmUnixMakefileGenerator.cxx
View file @
beaa7dc1
...
...
@@ -133,11 +133,10 @@ void cmUnixMakefileGenerator::OutputMakefile(const char* file)
this
->
OutputDependencies
(
fout
);
this
->
OutputTargets
(
fout
);
this
->
OutputSubDirectoryRules
(
fout
);
std
::
string
dependName
;
std
::
string
dependName
=
m_Makefile
->
GetStartOutputDirectory
();
dependName
+=
"/cmake.depends"
;
if
(
!
this
->
m_CacheOnly
)
{
dependName
=
m_Makefile
->
GetStartOutputDirectory
();
dependName
+=
"/cmake.depends"
;
std
::
ofstream
dependout
(
dependName
.
c_str
());
if
(
!
dependout
)
{
...
...
Templates/configure
View file @
beaa7dc1
...
...
@@ -2809,7 +2809,11 @@ case $system in
FreeBSD
*
)
CMAKE_USE_PTHREADS
=
0
CMAKE_THREAD_LIBS
=
""
;;
;;
CYGWIN_NT
*
)
CMAKE_THREAD_LIBS
=
""
CMAKE_USE_PTHREADS
=
0
;;
esac
fi
...
...
@@ -2819,7 +2823,6 @@ fi
CMAKE_ANSI_CFLAGS
=
""
# on hp use -Aa for ansi
if
test
$ac_cv_prog_gxx
=
no
;
then
...
...
@@ -2867,7 +2870,7 @@ fi
# ansi stream files (without the .h)
if
test
$ac_cv_prog_gxx
=
no
;
then
echo
$ac_n
"checking ansi standard C++ stream headers ""...
$ac_c
"
1>&6
echo
"configure:287
1
: checking ansi standard C++ stream headers "
>
&5
echo
"configure:287
4
: checking ansi standard C++ stream headers "
>
&5
echo
"******"
rm
-rf
conftest.
*
cat
>
conftest.cc <<
!
...
...
@@ -2888,7 +2891,7 @@ fi
if
test
$ac_cv_prog_gxx
=
no
;
then
echo
"******"
echo
$ac_n
"checking ansi standard namespace support ""...
$ac_c
"
1>&6
echo
"configure:289
2
: checking ansi standard namespace support "
>
&5
echo
"configure:289
5
: checking ansi standard namespace support "
>
&5
rm
-rf
conftest.
*
cat
>
conftest.cc <<
!
#include <list>
...
...
@@ -2916,7 +2919,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set
dummy
$ac_prog
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:292
0
: checking for
$ac_word
"
>
&5
echo
"configure:292
3
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_path_RUNMAKE
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
@@ -2956,7 +2959,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set
dummy
$ac_prog
;
ac_word
=
$2
echo
$ac_n
"checking for
$ac_word
""...
$ac_c
"
1>&6
echo
"configure:296
0
: checking for
$ac_word
"
>
&5
echo
"configure:296
3
: checking for
$ac_word
"
>
&5
if
eval
"test
\"
`
echo
'$''{'
ac_cv_path_CMAKE_AR
'+set}'
`
\"
= set"
;
then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
...
...
Templates/configure.in
View file @
beaa7dc1
...
...
@@ -386,11 +386,14 @@ case $system in
FreeBSD*)
CMAKE_USE_PTHREADS=0
CMAKE_THREAD_LIBS=""
;;
;;
CYGWIN_NT*)
CMAKE_THREAD_LIBS=""
CMAKE_USE_PTHREADS=0
;;
esac
fi
AC_SUBST(CMAKE_USE_SPROC)
AC_SUBST(CMAKE_USE_PTHREADS)
AC_SUBST(CMAKE_HP_PTHREADS)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment