Commit 0a28cfdf authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: move changes from head

parent 055fb8fe
......@@ -7,7 +7,7 @@ SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 4)
SET(CMake_VERSION_PATCH 8)
# for an actual release this should not be defined
SET(CMake_VERSION_RC 1)
SET(CMake_VERSION_RC 2)
SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}")
......
Changes in CMake 2.4.8
Changes in CMake 2.4.8 RC 2
* fix for bug 5590 relative paths in windows not working across drives
* fix warning/error with TAR_VERBOSE flag
Changes in CMake 2.4.8 RC 1
* Fix for kde4-config location
* Fix for self extracting .sh files on solaris
* Remove KDE3_ENABLE_FINAL (did not work)
......
......@@ -231,7 +231,7 @@ int cmCPackTGZGenerator::CompressFiles(const char* outFileName,
int options = 0;
if(this->GeneratorVerbose)
{
options != TAR_VERBOSE;
options |= TAR_VERBOSE;
}
#ifdef __CYGWIN__
options |= TAR_GNU;
......
......@@ -178,7 +178,7 @@ int cmCPackTarCompressGenerator::CompressFiles(const char* outFileName,
int options = 0;
if(this->GeneratorVerbose)
{
options != TAR_VERBOSE;
options |= TAR_VERBOSE;
}
#ifdef __CYGWIN__
options |= TAR_GNU;
......
......@@ -1585,7 +1585,7 @@ bool cmSystemTools::CreateTar(const char* outFileName,
int options = 0;
if(verbose)
{
options != TAR_VERBOSE;
options |= TAR_VERBOSE;
}
#ifdef __CYGWIN__
options |= TAR_GNU;
......
......@@ -2704,22 +2704,15 @@ kwsys_stl::string SystemTools::RelativePath(const char* local, const char* remot
sameCount++;
}
#if 0
// NOTE: We did this at one time to prevent relative paths to the
// compiler from looking like "../../../../../../../usr/bin/gcc".
// Now however relative paths are only computed for destinations
// inside the build tree so this is not a problem. This is now a
// general-purpose method and should not have this hack. I'm
// leaving it in place in case removing it causes a problem so it is
// easy to restore:
//
// If there is nothing in common but the root directory, then just
// return the full path.
if(sameCount <= 1)
// If there is nothing in common at all then just return the full
// path. This is the case only on windows when the paths have
// different drive letters. On unix two full paths always at least
// have the root "/" in common so we will return a relative path
// that passes through the root directory.
if(sameCount == 0)
{
return remote;
}
#endif
// for each entry that is not common in the local path
// add a ../ to the finalpath array, this gets us out of the local
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment