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

BUG: fix solaris problems in install and ar

Browse Source
This commit is contained in:
Bill Hoffman 2001-07-05 12:03:57 -04:00
parent 3524dc421f
commit 863ca7d0e2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmUnixMakefileGenerator.cxx
View File

@ -1042,7 +1042,7 @@ void cmUnixMakefileGenerator::OutputInstallRules(std::ostream& fout)
for (i = sf.begin(); i != sf.end(); ++i) for (i = sf.begin(); i != sf.end(); ++i)
{ {
fout << "\t@ echo \"Installing " << *i << " \"\n"; fout << "\t@ echo \"Installing " << *i << " \"\n";
fout << "\t@if [ -e " << *i << " ] ; then \\\n"; fout << "\t@if [ -f " << *i << " ] ; then \\\n";
// avoid using install-sh to install install-sh // avoid using install-sh to install install-sh
// does not work on windows.... // does not work on windows....
if(*i == "install-sh") if(*i == "install-sh")
@ -1055,7 +1055,7 @@ void cmUnixMakefileGenerator::OutputInstallRules(std::ostream& fout)
} }
fout << *i fout << *i
<< " " << prefix << l->second.GetInstallPath() << "; \\\n"; << " " << prefix << l->second.GetInstallPath() << "; \\\n";
fout << "\t elif [ -e ${srcdir}/" << *i << " ] ; then \\\n"; fout << "\t elif [ -f ${srcdir}/" << *i << " ] ; then \\\n";
// avoid using install-sh to install install-sh // avoid using install-sh to install install-sh
// does not work on windows.... // does not work on windows....
if(*i == "install-sh") if(*i == "install-sh")

2
Templates/configure vendored
View File

@ -3054,7 +3054,7 @@ case $system in
: :
else else
echo "Using $CXX -xar -o for creating .a libraries" echo "Using $CXX -xar -o for creating .a libraries"
CMAKE_AR="$CXX -xar -o" CMAKE_AR="$CXX"
CMAKE_AR_ARGS="-xar -o" CMAKE_AR_ARGS="-xar -o"
fi fi
esac esac

2
Templates/configure.in
View File

@ -551,7 +551,7 @@ case $system in
: :
else else
echo "Using $CXX -xar -o for creating .a libraries" echo "Using $CXX -xar -o for creating .a libraries"
CMAKE_AR="$CXX -xar -o" CMAKE_AR="$CXX"
CMAKE_AR_ARGS="-xar -o" CMAKE_AR_ARGS="-xar -o"
fi fi
esac esac