Hello community,
here is the log from the commit of package cmake
checked in at Fri Jan 12 01:20:12 CET 2007.
--------
--- cmake/cmake.changes 2007-01-08 10:58:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/cmake/cmake.changes 2007-01-11 21:09:02.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Jan 11 21:08:27 CET 2007 - dmueller@suse.de
+
+- update to 2.4.6:
+ * Fix for FIND_* order and framworks with PREFIX usage.
+ * Fix for FindDoxygen and quiet mode.
+ * Find JavaVM as well as jvm
+ * Look for ruby1.8 and ruby
+ * Fix for cpack .tgz.sh and dash
+ * Fix for finding custom commands from a full path with CMAKE_CFG_INTDIR.
+ * Fix for Borland make and custom commands that do nothing
+
+-------------------------------------------------------------------
Old:
----
cmake-2.4.5.tar.bz2
New:
----
cmake-2.4.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmake.spec ++++++
--- /var/tmp/diff_new_pack.C29640/_old 2007-01-12 01:19:51.000000000 +0100
+++ /var/tmp/diff_new_pack.C29640/_new 2007-01-12 01:19:51.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package cmake (Version 2.4.5)
+# spec file for package cmake (Version 2.4.6)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,8 +11,8 @@
# norootforbuild
Name: cmake
-Version: 2.4.5
-Release: 3
+Version: 2.4.6
+Release: 1
#
License: Other License(s), see package
Group: Development/Tools/Building
@@ -67,6 +67,15 @@
/usr/share/man/man1/ctest.1.gz
%changelog -n cmake
+* Thu Jan 11 2007 - dmueller@suse.de
+- update to 2.4.6:
+ * Fix for FIND_* order and framworks with PREFIX usage.
+ * Fix for FindDoxygen and quiet mode.
+ * Find JavaVM as well as jvm
+ * Look for ruby1.8 and ruby
+ * Fix for cpack .tgz.sh and dash
+ * Fix for finding custom commands from a full path with CMAKE_CFG_INTDIR.
+ * Fix for Borland make and custom commands that do nothing
* Mon Jan 08 2007 - dmueller@suse.de
- readd patch to detect shared python library instead of
the static one.
++++++ cmake-2.4.5.tar.bz2 -> cmake-2.4.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/ChangeLog.manual new/cmake-2.4.6/ChangeLog.manual
--- old/cmake-2.4.5/ChangeLog.manual 2006-12-04 17:03:51.000000000 +0100
+++ new/cmake-2.4.6/ChangeLog.manual 2007-01-10 18:59:11.000000000 +0100
@@ -1,3 +1,22 @@
+Changes in CMake 2.4.6
+
+* Remove svn test in ctestctest3
+
+* Fix for FIND_* order and framworks with PREFIX usage.
+
+* Fix for FindDoxygen and quiet mode.
+
+* Find JavaVM as well as jvm
+
+* Look for ruby1.8 and ruby
+
+* Fix for cpack .tgz.sh and dash
+
+* Fix for finding custom commands from a full path with CMAKE_CFG_INTDIR.
+
+* Fix for Borland make and custom commands that do nothing
+
+
Changes in CMake 2.4.5
* Fix for seg fault when a macro runs a bad command BUG# 3815
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/CMakeLists.txt new/cmake-2.4.6/CMakeLists.txt
--- old/cmake-2.4.5/CMakeLists.txt 2006-12-04 17:03:52.000000000 +0100
+++ new/cmake-2.4.6/CMakeLists.txt 2007-01-10 18:59:11.000000000 +0100
@@ -5,9 +5,9 @@
# The CMake version number.
SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 4)
-SET(CMake_VERSION_PATCH 5)
+SET(CMake_VERSION_PATCH 6)
# for an actual release this should not be defined
-#SET(CMake_VERSION_RC 4)
+#SET(CMake_VERSION_RC 2)
SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/Modules/CPack.STGZ_Header.sh.in new/cmake-2.4.6/Modules/CPack.STGZ_Header.sh.in
--- old/cmake-2.4.5/Modules/CPack.STGZ_Header.sh.in 2006-12-04 17:03:52.000000000 +0100
+++ new/cmake-2.4.6/Modules/CPack.STGZ_Header.sh.in 2007-01-10 18:59:12.000000000 +0100
@@ -58,7 +58,7 @@
fi
done
-if [ "x${cpack_include_subdir}x" != "xx" -o "x${cpack_skip_license}x" == "xTRUEx" ]
+if [ "x${cpack_include_subdir}x" != "xx" -o "x${cpack_skip_license}x" = "xTRUEx" ]
then
interactive=FALSE
fi
@@ -73,7 +73,7 @@
echo "The archive will be extracted to: ${toplevel}"
-if [ "x${interactive}x" == "xTRUEx" ]
+if [ "x${interactive}x" = "xTRUEx" ]
then
echo ""
echo "If you want to stop extracting, please press <ctrl-C>."
@@ -95,7 +95,7 @@
esac
fi
- if [ "x${cpack_include_subdir}x" == "xx" ]
+ if [ "x${cpack_include_subdir}x" = "xx" ]
then
echo "By default the @CPACK_PACKAGE_NAME@ will be installed in:"
echo " \"${toplevel}/@CPACK_PACKAGE_FILE_NAME@\""
@@ -110,7 +110,7 @@
fi
fi
-if [ "x${cpack_include_subdir}x" == "xTRUEx" ]
+if [ "x${cpack_include_subdir}x" = "xTRUEx" ]
then
toplevel="${toplevel}/@CPACK_PACKAGE_FILE_NAME@"
mkdir -p "${toplevel}"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/Modules/FindDoxygen.cmake new/cmake-2.4.6/Modules/FindDoxygen.cmake
--- old/cmake-2.4.5/Modules/FindDoxygen.cmake 2006-12-04 17:03:52.000000000 +0100
+++ new/cmake-2.4.6/Modules/FindDoxygen.cmake 2007-01-10 18:59:12.000000000 +0100
@@ -23,6 +23,13 @@
SET(TEMP_DOXYGEN_SAVE_CMAKE_FIND_APPBUNDLE ${CMAKE_FIND_APPBUNDLE})
# Disable the App-bundle detection feature
SET(CMAKE_FIND_APPBUNDLE "NEVER")
+# For backwards compatibility support
+# DOXYGEN_FIND_QUIETLY, but it should have been
+# Doxygen_FIND_QUIETLY.
+IF(Doxygen_FIND_QUIETLY)
+ SET(DOXYGEN_FIND_QUIETLY TRUE)
+ENDIF(Doxygen_FIND_QUIETLY)
+
IF (NOT DOXYGEN_FIND_QUIETLY)
MESSAGE(STATUS "Looking for doxygen...")
ENDIF (NOT DOXYGEN_FIND_QUIETLY)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/Modules/FindJNI.cmake new/cmake-2.4.6/Modules/FindJNI.cmake
--- old/cmake-2.4.5/Modules/FindJNI.cmake 2006-12-04 17:03:52.000000000 +0100
+++ new/cmake-2.4.6/Modules/FindJNI.cmake 2007-01-10 18:59:12.000000000 +0100
@@ -96,7 +96,7 @@
FIND_LIBRARY(JAVA_AWT_LIBRARY jawt
PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES}
)
- FIND_LIBRARY(JAVA_JVM_LIBRARY jvm
+ FIND_LIBRARY(JAVA_JVM_LIBRARY NAMES jvm JavaVM
PATHS ${JAVA_JVM_LIBRARY_DIRECTORIES}
)
ENDIF(APPLE)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/Modules/FindRuby.cmake new/cmake-2.4.6/Modules/FindRuby.cmake
--- old/cmake-2.4.5/Modules/FindRuby.cmake 2006-12-04 17:03:53.000000000 +0100
+++ new/cmake-2.4.6/Modules/FindRuby.cmake 2007-01-10 18:59:12.000000000 +0100
@@ -46,7 +46,7 @@
/usr/lib/ruby/1.8/i586-linux-gnu/ )
FIND_LIBRARY(RUBY_LIBRARY
- NAMES ruby
+ NAMES ruby ruby1.8
PATHS ${RUBY_POSSIBLE_LIB_PATH}
)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/Source/CMakeLists.txt new/cmake-2.4.6/Source/CMakeLists.txt
--- old/cmake-2.4.5/Source/CMakeLists.txt 2006-12-04 17:03:54.000000000 +0100
+++ new/cmake-2.4.6/Source/CMakeLists.txt 2007-01-10 18:59:12.000000000 +0100
@@ -402,6 +402,7 @@
--test-command ${CMAKE_CMAKE_COMMAND} -E compare_files
${CMake_SOURCE_DIR}/Tests/TargetName/scripts/hello_world
${CMake_BINARY_DIR}/Tests/TargetName/scripts/hello_world)
+
ADD_TEST(LibName ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/LibName"
@@ -414,6 +415,18 @@
--test-command foobar
)
+ ADD_TEST(CustComDepend ${CMAKE_CTEST_COMMAND}
+ --build-and-test
+ "${CMake_SOURCE_DIR}/Tests/CustComDepend"
+ "${CMake_BINARY_DIR}/Tests/CustComDepend"
+ --build-two-config
+ --build-generator ${CMAKE_TEST_GENERATOR}
+ --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+ --build-project CustComDepend
+ --build-exe-dir "${CMake_BINARY_DIR}/Tests/CustComDepend/bin"
+ --test-command foo bar.c
+ )
+
ADD_TEST(CustomCommand ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/CustomCommand"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/Source/cmFindBase.cxx new/cmake-2.4.6/Source/cmFindBase.cxx
--- old/cmake-2.4.5/Source/cmFindBase.cxx 2006-12-04 17:03:56.000000000 +0100
+++ new/cmake-2.4.6/Source/cmFindBase.cxx 2007-01-10 18:59:12.000000000 +0100
@@ -3,8 +3,8 @@
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmFindBase.cxx,v $
Language: C++
- Date: $Date: 2006/11/13 17:59:55 $
- Version: $Revision: 1.14.2.4 $
+ Date: $Date: 2007/01/03 21:09:14 $
+ Version: $Revision: 1.14.2.5 $
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
@@ -444,14 +444,13 @@
this->AddFrameWorkPaths();
}
}
+ std::vectorstd::string paths;
// add the paths specified in the FIND_* call
for(unsigned int i =0; i < userPaths.size(); ++i)
{
- this->SearchPaths.push_back(userPaths[i]);
+ paths.push_back(userPaths[i]);
}
-
- // clean things up
- this->ExpandRegistryAndCleanPath();
+ this->AddPaths(paths);
}
void cmFindBase::AddEnvironmentVairables()
@@ -459,16 +458,17 @@
std::string var = "CMAKE_";
var += this->CMakePathName;
var += "_PATH";
- cmSystemTools::GetPath(this->SearchPaths, var.c_str());
+ std::vectorstd::string paths;
+ cmSystemTools::GetPath(paths, var.c_str());
if(this->SearchAppBundleLast)
{
- cmSystemTools::GetPath(this->SearchPaths, "CMAKE_APPBUNDLE_PATH");
+ cmSystemTools::GetPath(paths, "CMAKE_APPBUNDLE_PATH");
}
if(this->SearchFrameworkLast)
{
- cmSystemTools::GetPath(this->SearchPaths, "CMAKE_FRAMEWORK_PATH");
+ cmSystemTools::GetPath(paths, "CMAKE_FRAMEWORK_PATH");
}
-
+ this->AddPaths(paths);
}
void cmFindBase::AddFrameWorkPaths()
@@ -477,10 +477,11 @@
{
return;
}
+ std::vectorstd::string paths;
// first environment variables
if(!this->NoCMakeEnvironmentPath)
{
- cmSystemTools::GetPath(this->SearchPaths, "CMAKE_FRAMEWORK_PATH");
+ cmSystemTools::GetPath(paths, "CMAKE_FRAMEWORK_PATH");
}
// add cmake variables
if(!this->NoCMakePath)
@@ -488,7 +489,7 @@
if(const char* path =
this->Makefile->GetDefinition("CMAKE_FRAMEWORK_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
// AddCMakeSystemVariables
@@ -497,9 +498,20 @@
if(const char* path =
this->Makefile->GetDefinition("CMAKE_SYSTEM_FRAMEWORK_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
+ this->AddPaths(paths);
+}
+
+void cmFindBase::AddPaths(std::vectorstd::string & paths)
+{
+ // add suffixes and clean up paths
+ this->ExpandRegistryAndCleanPath(paths);
+ // add the paths to the search paths
+ this->SearchPaths.insert(this->SearchPaths.end(),
+ paths.begin(),
+ paths.end());
}
void cmFindBase::AddAppBundlePaths()
@@ -508,10 +520,11 @@
{
return;
}
+ std::vectorstd::string paths;
// first environment variables
if(!this->NoCMakeEnvironmentPath)
{
- cmSystemTools::GetPath(this->SearchPaths, "CMAKE_APPBUNDLE_PATH");
+ cmSystemTools::GetPath(paths, "CMAKE_APPBUNDLE_PATH");
}
// add cmake variables
if(!this->NoCMakePath)
@@ -519,7 +532,7 @@
if(const char* path =
this->Makefile->GetDefinition("CMAKE_APPBUNDLE_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
// AddCMakeSystemVariables
@@ -528,9 +541,10 @@
if(const char* path =
this->Makefile->GetDefinition("CMAKE_SYSTEM_APPBUNDLE_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
+ this->AddPaths(paths);
}
void cmFindBase::AddCMakeVairables()
@@ -538,16 +552,17 @@
std::string var = "CMAKE_";
var += this->CMakePathName;
var += "_PATH";
+ std::vectorstd::string paths;
if(const char* path = this->Makefile->GetDefinition(var.c_str()))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
if(this->SearchAppBundleLast)
{
if(const char* path =
this->Makefile->GetDefinition("CMAKE_APPBUNDLE_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
if(this->SearchFrameworkLast)
@@ -555,20 +570,23 @@
if(const char* path =
this->Makefile->GetDefinition("CMAKE_FRAMEWORK_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
+ this->AddPaths(paths);
}
void cmFindBase::AddSystemEnvironmentVairables()
{
// Add LIB or INCLUDE
+ std::vectorstd::string paths;
if(this->EnvironmentPath.size())
{
- cmSystemTools::GetPath(this->SearchPaths, this->EnvironmentPath.c_str());
+ cmSystemTools::GetPath(paths, this->EnvironmentPath.c_str());
}
// Add PATH
- cmSystemTools::GetPath(this->SearchPaths);
+ cmSystemTools::GetPath(paths);
+ this->AddPaths(paths);
}
void cmFindBase::AddCMakeSystemVariables()
@@ -576,16 +594,17 @@
std::string var = "CMAKE_SYSTEM_";
var += this->CMakePathName;
var += "_PATH";
+ std::vectorstd::string paths;
if(const char* path = this->Makefile->GetDefinition(var.c_str()))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
if(this->SearchAppBundleLast)
{
if(const char* path =
this->Makefile->GetDefinition("CMAKE_SYSTEM_APPBUNDLE_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
if(this->SearchFrameworkLast)
@@ -593,23 +612,28 @@
if(const char* path =
this->Makefile->GetDefinition("CMAKE_SYSTEM_FRAMEWORK_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
+ this->AddPaths(paths);
}
-void cmFindBase::ExpandRegistryAndCleanPath()
+void cmFindBase::ExpandRegistryAndCleanPath(std::vectorstd::string& paths)
{
std::vectorstd::string finalPath;
std::vectorstd::string::iterator i;
- for(i = this->SearchPaths.begin();
- i != this->SearchPaths.end(); ++i)
+ // glob and expand registry stuff from paths and put
+ // into finalPath
+ for(i = paths.begin();
+ i != paths.end(); ++i)
{
cmSystemTools::ExpandRegistryValues(*i);
cmSystemTools::GlobDirs(i->c_str(), finalPath);
}
- this->SearchPaths.clear();
- // convert all paths to unix slashes
+ // clear the path
+ paths.clear();
+ // convert all paths to unix slashes and add search path suffixes
+ // if there are any
for(i = finalPath.begin();
i != finalPath.end(); ++i)
{
@@ -623,7 +647,7 @@
std::string p = *i + std::string("/") + *j;
// add to all paths because the search path may be modified
// later with lib being replaced for lib64 which may exist
- this->SearchPaths.push_back(p);
+ paths.push_back(p);
}
}
// now put the path without the path suffixes in the SearchPaths
@@ -632,7 +656,7 @@
{
// put all search paths in because it may later be replaced
// by lib64 stuff fixes bug 4009
- this->SearchPaths.push_back(*i);
+ paths.push_back(*i);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/Source/cmFindBase.h new/cmake-2.4.6/Source/cmFindBase.h
--- old/cmake-2.4.5/Source/cmFindBase.h 2006-12-04 17:03:56.000000000 +0100
+++ new/cmake-2.4.6/Source/cmFindBase.h 2007-01-10 18:59:12.000000000 +0100
@@ -3,8 +3,8 @@
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmFindBase.h,v $
Language: C++
- Date: $Date: 2006/07/24 15:19:35 $
- Version: $Revision: 1.7.2.1 $
+ Date: $Date: 2007/01/03 21:09:14 $
+ Version: $Revision: 1.7.2.2 $
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
@@ -42,13 +42,15 @@
protected:
void PrintFindStuff();
void ExpandPaths(std::vectorstd::string userPaths);
+ // add to the SearchPaths
+ void AddPaths(std::vectorstd::string& paths);
void AddFrameWorkPaths();
void AddAppBundlePaths();
void AddEnvironmentVairables();
void AddCMakeVairables();
void AddSystemEnvironmentVairables();
void AddCMakeSystemVariables();
- void ExpandRegistryAndCleanPath();
+ void ExpandRegistryAndCleanPath(std::vectorstd::string& paths);
// see if the VariableName is already set in the cache,
// also copy the documentation from the cache to VariableDocumentation
// if it has documentation in the cache
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/Source/cmGlobalUnixMakefileGenerator3.h new/cmake-2.4.6/Source/cmGlobalUnixMakefileGenerator3.h
--- old/cmake-2.4.5/Source/cmGlobalUnixMakefileGenerator3.h 2006-12-04 17:03:57.000000000 +0100
+++ new/cmake-2.4.6/Source/cmGlobalUnixMakefileGenerator3.h 2007-01-10 18:59:13.000000000 +0100
@@ -3,8 +3,8 @@
Program: CMake - Cross-Platform Makefile Generator3
Module: $RCSfile: cmGlobalUnixMakefileGenerator3.h,v $
Language: C++
- Date: $Date: 2006/10/13 14:52:02 $
- Version: $Revision: 1.27.2.5 $
+ Date: $Date: 2007/01/03 15:19:03 $
+ Version: $Revision: 1.27.2.6 $
Copyright (c) 2005 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
@@ -115,6 +115,9 @@
no rule. This is used for multiple output dependencies. */
std::string GetEmptyCommandHack() { return this->EmptyCommandsHack; }
+ /** Get the fake dependency to use when a rule has no real commands
+ or dependencies. */
+ std::string GetEmptyRuleHackDepends() { return this->EmptyRuleHackDepends; }
// change the build command for speed
virtual std::string GenerateBuildCommand
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/Source/cmLocalGenerator.cxx new/cmake-2.4.6/Source/cmLocalGenerator.cxx
--- old/cmake-2.4.5/Source/cmLocalGenerator.cxx 2006-12-04 17:03:58.000000000 +0100
+++ new/cmake-2.4.6/Source/cmLocalGenerator.cxx 2007-01-10 18:59:13.000000000 +0100
@@ -3,8 +3,8 @@
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmLocalGenerator.cxx,v $
Language: C++
- Date: $Date: 2006/11/28 19:19:44 $
- Version: $Revision: 1.132.2.9 $
+ Date: $Date: 2007/01/03 15:19:03 $
+ Version: $Revision: 1.132.2.10 $
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
@@ -1865,6 +1865,8 @@
tLocation = cmSystemTools::GetFilenamePath(tLocation);
std::string depLocation = cmSystemTools::GetFilenamePath(
std::string(inName));
+ depLocation = cmSystemTools::CollapseFullPath(depLocation.c_str());
+ tLocation = cmSystemTools::CollapseFullPath(tLocation.c_str());
if(depLocation != tLocation)
{
// it is a full path to a depend that has the same name
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/Source/cmMakefileExecutableTargetGenerator.cxx new/cmake-2.4.6/Source/cmMakefileExecutableTargetGenerator.cxx
--- old/cmake-2.4.5/Source/cmMakefileExecutableTargetGenerator.cxx 2006-12-04 17:03:58.000000000 +0100
+++ new/cmake-2.4.6/Source/cmMakefileExecutableTargetGenerator.cxx 2007-01-10 18:59:13.000000000 +0100
@@ -3,8 +3,8 @@
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmMakefileExecutableTargetGenerator.cxx,v $
Language: C++
- Date: $Date: 2006/10/27 20:01:48 $
- Version: $Revision: 1.12.2.7 $
+ Date: $Date: 2007/01/03 15:19:03 $
+ Version: $Revision: 1.12.2.8 $
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
@@ -17,7 +17,7 @@
#include "cmMakefileExecutableTargetGenerator.h"
#include "cmGeneratedFileStream.h"
-#include "cmGlobalGenerator.h"
+#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/Source/cmMakefileLibraryTargetGenerator.cxx new/cmake-2.4.6/Source/cmMakefileLibraryTargetGenerator.cxx
--- old/cmake-2.4.5/Source/cmMakefileLibraryTargetGenerator.cxx 2006-12-04 17:03:59.000000000 +0100
+++ new/cmake-2.4.6/Source/cmMakefileLibraryTargetGenerator.cxx 2007-01-10 18:59:13.000000000 +0100
@@ -3,8 +3,8 @@
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmMakefileLibraryTargetGenerator.cxx,v $
Language: C++
- Date: $Date: 2006/10/27 20:01:48 $
- Version: $Revision: 1.14.2.5 $
+ Date: $Date: 2007/01/03 15:19:03 $
+ Version: $Revision: 1.14.2.6 $
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
@@ -17,7 +17,7 @@
#include "cmMakefileLibraryTargetGenerator.h"
#include "cmGeneratedFileStream.h"
-#include "cmGlobalGenerator.h"
+#include "cmGlobalUnixMakefileGenerator3.h"
#include "cmLocalUnixMakefileGenerator3.h"
#include "cmMakefile.h"
#include "cmSourceFile.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.4.5/Source/cmMakefileTargetGenerator.cxx new/cmake-2.4.6/Source/cmMakefileTargetGenerator.cxx
--- old/cmake-2.4.5/Source/cmMakefileTargetGenerator.cxx 2006-12-04 17:03:59.000000000 +0100
+++ new/cmake-2.4.6/Source/cmMakefileTargetGenerator.cxx 2007-01-10 18:59:13.000000000 +0100
@@ -3,8 +3,8 @@
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmMakefileTargetGenerator.cxx,v $
Language: C++
- Date: $Date: 2006/11/28 19:19:44 $
- Version: $Revision: 1.16.2.8 $
+ Date: $Date: 2007/01/03 15:19:03 $
+ Version: $Revision: 1.16.2.9 $
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
@@ -65,7 +65,8 @@
result->TargetName = tgtName;
result->Target = tgt;
result->LocalGenerator = lg;
- result->GlobalGenerator = lg->GetGlobalGenerator();
+ result->GlobalGenerator =
+ static_cast