ENH: fix install for cygwin, build cmake from configure
This commit is contained in:
Bill Hoffman
parent
7bb9fdbeef
commit
a5cda2217d
|
|
@ -10,7 +10,7 @@ IF(FLTK_LIBRARY)
|
|||
ENDIF(FLTK_LIBRARY)
|
||||
|
||||
SOURCE_FILES(SRCS
|
||||
cmake
|
||||
cmake.cxx
|
||||
cmMakeDepend.cxx
|
||||
cmMakefile.cxx
|
||||
cmMakefileGenerator.cxx
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ void cmSystemTools::GetPath(std::vector<std::string>& path)
|
|||
|
||||
const char* cmSystemTools::GetExecutableExtension()
|
||||
{
|
||||
#if defined(_WIN32)
|
||||
#if defined(_WIN32) || defined(__CYGWIN__)
|
||||
return ".exe";
|
||||
#else
|
||||
return "";
|
||||
|
|
|
|||
|
|
@ -547,27 +547,41 @@ void cmUnixMakefileGenerator::OutputDependencies(std::ostream& fout)
|
|||
// Search the list of libraries that will be linked into
|
||||
// the executable
|
||||
emitted.clear();
|
||||
bool dll = this->BuildingSharedLibs();
|
||||
for(lib2 = libs.begin(); lib2 != libs.end(); ++lib2)
|
||||
{
|
||||
if( ! emitted.insert(lib2->first).second ) continue;
|
||||
|
||||
const char* cacheValue
|
||||
= cmCacheManager::GetInstance()->GetCacheValue(lib2->first.c_str());
|
||||
if(cacheValue
|
||||
&& (strcmp(m_Makefile->GetCurrentOutputDirectory(), cacheValue) != 0))
|
||||
if(cacheValue )
|
||||
{
|
||||
std::string libpath = cacheValue;
|
||||
if(m_LibraryOutputPath.size())
|
||||
// if there is a cache value then this is a library that cmake
|
||||
// knows how to build, so we can depend on it
|
||||
std::string libpath;
|
||||
if (strcmp(m_Makefile->GetCurrentOutputDirectory(), cacheValue) != 0)
|
||||
{
|
||||
libpath = m_LibraryOutputPath;
|
||||
libpath += "lib";
|
||||
// if the library is not in the current directory, then get the full
|
||||
// path to it
|
||||
std::string libpath = cacheValue;
|
||||
if(m_LibraryOutputPath.size())
|
||||
{
|
||||
libpath = m_LibraryOutputPath;
|
||||
libpath += "lib";
|
||||
}
|
||||
else
|
||||
{
|
||||
libpath += "/lib";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
libpath += "/lib";
|
||||
// library is in current Makefile so use lib as a prefix
|
||||
libpath = "lib";
|
||||
}
|
||||
libpath += lib2->first;
|
||||
bool dll = this->BuildingSharedLibs();
|
||||
// add the library name
|
||||
libpath += lib2->first;
|
||||
// add the correct extension
|
||||
if(dll)
|
||||
{
|
||||
libpath += m_Makefile->GetDefinition("CMAKE_SHLIB_SUFFIX");
|
||||
|
|
@ -580,7 +594,6 @@ void cmUnixMakefileGenerator::OutputDependencies(std::ostream& fout)
|
|||
}
|
||||
}
|
||||
fout << "\n\n";
|
||||
|
||||
emitted.clear();
|
||||
for(lib2 = libs.begin(); lib2 != libs.end(); ++lib2)
|
||||
{
|
||||
|
|
@ -1019,7 +1032,8 @@ void cmUnixMakefileGenerator::OutputInstallRules(std::ostream& fout)
|
|||
break;
|
||||
case cmTarget::WIN32_EXECUTABLE:
|
||||
case cmTarget::EXECUTABLE:
|
||||
fout << "\t$(INSTALL_PROGRAM) " << l->first
|
||||
fout << "\t$(INSTALL_PROGRAM) " << l->first
|
||||
<< cmSystemTools::GetExecutableExtension()
|
||||
<< " " << prefix << l->second.GetInstallPath() << "\n";
|
||||
break;
|
||||
case cmTarget::INSTALL:
|
||||
|
|
@ -1030,10 +1044,30 @@ void cmUnixMakefileGenerator::OutputInstallRules(std::ostream& fout)
|
|||
{
|
||||
fout << "\t@ echo \"Installing " << *i << " \"\n";
|
||||
fout << "\t@if [ -e " << *i << " ] ; then \\\n";
|
||||
fout << "\t $(INSTALL) " << *i
|
||||
// avoid using install-sh to install install-sh
|
||||
// does not work on windows....
|
||||
if(*i == "install-sh")
|
||||
{
|
||||
fout << "\t cp ";
|
||||
}
|
||||
else
|
||||
{
|
||||
fout << "\t $(INSTALL) ";
|
||||
}
|
||||
fout << *i
|
||||
<< " " << prefix << l->second.GetInstallPath() << "; \\\n";
|
||||
fout << "\t elif [ -e ${srcdir}/" << *i << " ] ; then \\\n";
|
||||
fout << "\t $(INSTALL) ${srcdir}/" << *i
|
||||
// avoid using install-sh to install install-sh
|
||||
// does not work on windows....
|
||||
if(*i == "install-sh")
|
||||
{
|
||||
fout << "\t cp ";
|
||||
}
|
||||
else
|
||||
{
|
||||
fout << "\t $(INSTALL) ";
|
||||
}
|
||||
fout << "${srcdir}/" << *i
|
||||
<< " " << prefix << l->second.GetInstallPath() << "; \\\n";
|
||||
fout << "\telse \\\n";
|
||||
fout << "\t echo \" ERROR!!! Unable to find: " << *i
|
||||
|
|
@ -1103,11 +1137,15 @@ void cmUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
|
|||
0,
|
||||
"${CMAKE_COMMAND} "
|
||||
"-H${CMAKE_SOURCE_DIR} -B${CMAKE_BINARY_DIR}");
|
||||
this->OutputMakeRule(fout,
|
||||
"Rebuild cmake dummy rule",
|
||||
"${CMAKE_COMMAND}",
|
||||
0,
|
||||
"echo \"cmake might be out of date\"");
|
||||
// do not put this command in for the cmake project
|
||||
if(strcmp(m_Makefile->GetProjectName(), "CMake") != 0)
|
||||
{
|
||||
this->OutputMakeRule(fout,
|
||||
"Rebuild cmake dummy rule",
|
||||
"${CMAKE_COMMAND}",
|
||||
0,
|
||||
"echo \"cmake might be out of date\"");
|
||||
}
|
||||
this->OutputMakeRule(fout,
|
||||
"Rule to keep make from removing Makefiles "
|
||||
"if control-C is hit during a run of cmake.",
|
||||
|
|
|
|||
|
|
@ -224,6 +224,11 @@ void cmake::AddCMakePaths(const std::vector<std::string>& args)
|
|||
|
||||
int cmake::Generate(const std::vector<std::string>& args)
|
||||
{
|
||||
if(args.size() == 1 && !cmSystemTools::FileExists("CMakeLists.txt"))
|
||||
{
|
||||
this->Usage(args[0].c_str());
|
||||
return -1;
|
||||
}
|
||||
// look for obvious request for help
|
||||
for(unsigned int i=1; i < args.size(); ++i)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,14 +1,27 @@
|
|||
#!/bin/sh
|
||||
|
||||
#
|
||||
# install - install a program, script, or datafile
|
||||
# This comes from X11R5; it is not part of GNU.
|
||||
# This comes from X11R5 (mit/util/scripts/install.sh).
|
||||
#
|
||||
# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
|
||||
# Copyright 1991 by the Massachusetts Institute of Technology
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||
# documentation for any purpose is hereby granted without fee, provided that
|
||||
# the above copyright notice appear in all copies and that both that
|
||||
# copyright notice and this permission notice appear in supporting
|
||||
# documentation, and that the name of M.I.T. not be used in advertising or
|
||||
# publicity pertaining to distribution of the software without specific,
|
||||
# written prior permission. M.I.T. makes no representations about the
|
||||
# suitability of this software for any purpose. It is provided "as is"
|
||||
# without express or implied warranty.
|
||||
#
|
||||
# Calling this script install-sh is preferred over install.sh, to prevent
|
||||
# `make' implicit rules from creating a file called install from it
|
||||
# when there is no Makefile.
|
||||
#
|
||||
# This script is compatible with the BSD install script, but was written
|
||||
# from scratch.
|
||||
#
|
||||
# from scratch. It can only install one file at a time, a restriction
|
||||
# shared with many OS's install programs.
|
||||
|
||||
|
||||
# set DOITPROG to echo to test this script
|
||||
|
|
@ -26,10 +39,12 @@ chownprog="${CHOWNPROG-chown}"
|
|||
chgrpprog="${CHGRPPROG-chgrp}"
|
||||
stripprog="${STRIPPROG-strip}"
|
||||
rmprog="${RMPROG-rm}"
|
||||
mkdirprog="${MKDIRPROG-mkdir -p}"
|
||||
mkdirprog="${MKDIRPROG-mkdir}"
|
||||
|
||||
transformbasename=""
|
||||
transform_arg=""
|
||||
instcmd="$mvprog"
|
||||
chmodcmd=""
|
||||
chmodcmd="$chmodprog 0755"
|
||||
chowncmd=""
|
||||
chgrpcmd=""
|
||||
stripcmd=""
|
||||
|
|
@ -37,7 +52,7 @@ rmcmd="$rmprog -f"
|
|||
mvcmd="$mvprog"
|
||||
src=""
|
||||
dst=""
|
||||
mkdir=n
|
||||
dir_arg=""
|
||||
|
||||
while [ x"$1" != x ]; do
|
||||
case $1 in
|
||||
|
|
@ -45,9 +60,7 @@ while [ x"$1" != x ]; do
|
|||
shift
|
||||
continue;;
|
||||
|
||||
-d) instcmd="$mkdirprog"
|
||||
mkdir=y
|
||||
src="/dev/null"
|
||||
-d) dir_arg=true
|
||||
shift
|
||||
continue;;
|
||||
|
||||
|
|
@ -70,10 +83,20 @@ while [ x"$1" != x ]; do
|
|||
shift
|
||||
continue;;
|
||||
|
||||
-t=*) transformarg=`echo $1 | sed 's/-t=//'`
|
||||
shift
|
||||
continue;;
|
||||
|
||||
-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
|
||||
shift
|
||||
continue;;
|
||||
|
||||
*) if [ x"$src" = x ]
|
||||
then
|
||||
src=$1
|
||||
else
|
||||
# this colon is to work around a 386BSD /bin/sh bug
|
||||
:
|
||||
dst=$1
|
||||
fi
|
||||
shift
|
||||
|
|
@ -83,53 +106,146 @@ done
|
|||
|
||||
if [ x"$src" = x ]
|
||||
then
|
||||
echo "install: no input file specified"
|
||||
echo "install: no input file specified"
|
||||
exit 1
|
||||
else
|
||||
true
|
||||
fi
|
||||
|
||||
if [ x"$dst" = x ]
|
||||
then
|
||||
echo "install: no destination specified"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
if [ $mkdir = y ]; then
|
||||
$doit $instcmd $dst
|
||||
dsttmp=$dst
|
||||
if [ x"$dir_arg" != x ]; then
|
||||
dst=$src
|
||||
src=""
|
||||
|
||||
if [ -d $dst ]; then
|
||||
instcmd=:
|
||||
chmodcmd=""
|
||||
else
|
||||
instcmd=mkdir
|
||||
fi
|
||||
else
|
||||
|
||||
# If destination is a directory, append the input filename; if your
|
||||
# system does not like double slashes in filenames, you may need to
|
||||
# add some logic
|
||||
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
|
||||
# might cause directories to be created, which would be especially bad
|
||||
# if $src (and thus $dsttmp) contains '*'.
|
||||
|
||||
if [ $mkdir = n -a -d $dst ]
|
||||
if [ -f $src -o -d $src ]
|
||||
then
|
||||
dst="$dst"/`basename $src`
|
||||
true
|
||||
else
|
||||
echo "install: $src does not exist"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ x"$dst" = x ]
|
||||
then
|
||||
echo "install: no destination specified"
|
||||
exit 1
|
||||
else
|
||||
true
|
||||
fi
|
||||
|
||||
# Make a temp file name in the proper directory.
|
||||
|
||||
dstdir=`dirname $dst`
|
||||
# If destination is a directory, append the input filename; if your system
|
||||
# does not like double slashes in filenames, you may need to add some logic
|
||||
|
||||
if [ -d $dst ]
|
||||
then
|
||||
dst="$dst"/`basename $src`
|
||||
else
|
||||
true
|
||||
fi
|
||||
fi
|
||||
|
||||
## this sed command emulates the dirname command
|
||||
dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
|
||||
|
||||
# Make sure that the destination directory exists.
|
||||
# this part is taken from Noah Friedman's mkinstalldirs script
|
||||
|
||||
# Skip lots of stat calls in the usual case.
|
||||
if [ ! -d "$dstdir" ]; then
|
||||
defaultIFS='
|
||||
'
|
||||
IFS="${IFS-${defaultIFS}}"
|
||||
|
||||
oIFS="${IFS}"
|
||||
# Some sh's can't handle IFS=/ for some reason.
|
||||
IFS='%'
|
||||
set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
|
||||
IFS="${oIFS}"
|
||||
|
||||
pathcomp=''
|
||||
|
||||
while [ $# -ne 0 ] ; do
|
||||
pathcomp="${pathcomp}${1}"
|
||||
shift
|
||||
|
||||
if [ ! -d "${pathcomp}" ] ;
|
||||
then
|
||||
$mkdirprog "${pathcomp}"
|
||||
else
|
||||
true
|
||||
fi
|
||||
|
||||
pathcomp="${pathcomp}/"
|
||||
done
|
||||
fi
|
||||
|
||||
if [ x"$dir_arg" != x ]
|
||||
then
|
||||
$doit $instcmd $dst &&
|
||||
|
||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
|
||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
|
||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
|
||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
|
||||
else
|
||||
|
||||
# If we're going to rename the final executable, determine the name now.
|
||||
|
||||
if [ x"$transformarg" = x ]
|
||||
then
|
||||
dstfile=`basename $dst`
|
||||
else
|
||||
dstfile=`basename $dst $transformbasename |
|
||||
sed $transformarg`$transformbasename
|
||||
fi
|
||||
|
||||
# don't allow the sed command to completely eliminate the filename
|
||||
|
||||
if [ x"$dstfile" = x ]
|
||||
then
|
||||
dstfile=`basename $dst`
|
||||
else
|
||||
true
|
||||
fi
|
||||
|
||||
# Make a temp file name in the proper directory.
|
||||
|
||||
dsttmp=$dstdir/#inst.$$#
|
||||
|
||||
# Move or copy the file name to the temp name
|
||||
# Move or copy the file name to the temp name
|
||||
|
||||
$doit $instcmd $src $dsttmp &&
|
||||
|
||||
trap "rm -f ${dsttmp}" 0 &&
|
||||
|
||||
$doit $instcmd $src $dsttmp
|
||||
fi
|
||||
|
||||
# and set any options; do chmod last to preserve setuid bits
|
||||
|
||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
|
||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
|
||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
|
||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi
|
||||
# If any of these fail, we abort the whole thing. If we want to
|
||||
# ignore errors from any of these, just make sure not to ignore
|
||||
# errors from the above "$doit $instcmd $src $dsttmp" command.
|
||||
|
||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
|
||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
|
||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
|
||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
|
||||
|
||||
# Now rename the file to the real destination.
|
||||
|
||||
$doit $rmcmd -f $dstdir/$dstfile &&
|
||||
$doit $mvcmd $dsttmp $dstdir/$dstfile
|
||||
|
||||
fi &&
|
||||
|
||||
if [ $mkdir = n ]; then
|
||||
# Now rename the file to the real destination.
|
||||
|
||||
$doit $rmcmd $dst
|
||||
$doit $mvcmd $dsttmp $dst
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -983,6 +983,47 @@ EOF
|
|||
fi
|
||||
fi
|
||||
|
||||
# find make to use to build cmake, prefer gmake
|
||||
for ac_prog in gmake make
|
||||
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:993: 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
|
||||
case "$RUNMAKE" in
|
||||
/*)
|
||||
ac_cv_path_RUNMAKE="$RUNMAKE" # Let the user override the test with a path.
|
||||
;;
|
||||
?:/*)
|
||||
ac_cv_path_RUNMAKE="$RUNMAKE" # Let the user override the test with a dos path.
|
||||
;;
|
||||
*)
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_dummy="$PATH"
|
||||
for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
ac_cv_path_RUNMAKE="$ac_dir/$ac_word"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
RUNMAKE="$ac_cv_path_RUNMAKE"
|
||||
if test -n "$RUNMAKE"; then
|
||||
echo "$ac_t""$RUNMAKE" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
test -n "$RUNMAKE" && break
|
||||
done
|
||||
|
||||
|
||||
trap '' 1 2 15
|
||||
cat > confcache <<\EOF
|
||||
|
|
@ -1122,6 +1163,7 @@ s%@CXX@%$CXX%g
|
|||
s%@CMAKE_ROOT_DIR@%$CMAKE_ROOT_DIR%g
|
||||
s%@CMAKE_ANSI_CFLAGS@%$CMAKE_ANSI_CFLAGS%g
|
||||
s%@CMAKE_TEMPLATE_FLAGS@%$CMAKE_TEMPLATE_FLAGS%g
|
||||
s%@RUNMAKE@%$RUNMAKE%g
|
||||
|
||||
CEOF
|
||||
EOF
|
||||
|
|
@ -1336,4 +1378,11 @@ chmod +x $CONFIG_STATUS
|
|||
rm -fr confdefs* $ac_clean_files
|
||||
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
|
||||
|
||||
# build the CMakeBuildTargets program
|
||||
$RUNMAKE
|
||||
./Source/cmake $fullSrcDir
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -91,6 +91,15 @@ void foo() { std::list<int> l; }
|
|||
fi
|
||||
fi
|
||||
|
||||
# find make to use to build cmake, prefer gmake
|
||||
AC_PATH_PROGS(RUNMAKE, gmake make)
|
||||
|
||||
AC_OUTPUT(Makefile Source/Makefile)
|
||||
# build the CMakeBuildTargets program
|
||||
$RUNMAKE
|
||||
./Source/cmake $fullSrcDir
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue