[Cmake-commits] [cmake-commits] hoffman committed cmIncludeExternalMSProjectCommand.h 1.8 1.8.2.1 cmInstallTargetGenerator.cxx 1.62.2.4 1.62.2.5 cmMakefile.cxx 1.463.2.9 1.463.2.10 cmMakefile.h 1.230.2.5 1.230.2.6 cmake.cxx 1.375.2.14 1.375.2.15
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Dec 2 07:07:42 EST 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv12155/Source
Modified Files:
Tag: CMake-2-6
cmIncludeExternalMSProjectCommand.h
cmInstallTargetGenerator.cxx cmMakefile.cxx cmMakefile.h
cmake.cxx
Log Message:
ENH: merge in RC 5
Index: cmIncludeExternalMSProjectCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmIncludeExternalMSProjectCommand.h,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C 2 -d -r1.8 -r1.8.2.1
*** cmIncludeExternalMSProjectCommand.h 23 Jan 2008 15:27:59 -0000 1.8
--- cmIncludeExternalMSProjectCommand.h 2 Dec 2008 12:07:37 -0000 1.8.2.1
***************
*** 67,71 ****
" dep1 dep2 ...)\n"
"Includes an external Microsoft project in the generated workspace "
! "file. Currently does nothing on UNIX.";
}
--- 67,74 ----
" dep1 dep2 ...)\n"
"Includes an external Microsoft project in the generated workspace "
! "file. Currently does nothing on UNIX. This will create a "
! "target named INCLUDE_EXTERNAL_MSPROJECT_[projectname]. This can "
! "be used in the add_dependencies command to make things depend "
! "on the external project.";
}
Index: cmInstallTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.cxx,v
retrieving revision 1.62.2.4
retrieving revision 1.62.2.5
diff -C 2 -d -r1.62.2.4 -r1.62.2.5
*** cmInstallTargetGenerator.cxx 24 Oct 2008 15:18:48 -0000 1.62.2.4
--- cmInstallTargetGenerator.cxx 2 Dec 2008 12:07:39 -0000 1.62.2.5
***************
*** 490,497 ****
j != sharedLibs.end(); ++j)
{
// If the build tree and install tree use different path
// components of the install_name field then we need to create a
// mapping to be applied after installation.
- cmTarget* tgt = *j;
std::string for_build = tgt->GetInstallNameDirForBuildTree(config);
std::string for_install = tgt->GetInstallNameDirForInstallTree(config);
--- 490,504 ----
j != sharedLibs.end(); ++j)
{
+ cmTarget* tgt = *j;
+
+ // The install_name of an imported target does not change.
+ if(tgt->IsImported())
+ {
+ continue;
+ }
+
// If the build tree and install tree use different path
// components of the install_name field then we need to create a
// mapping to be applied after installation.
std::string for_build = tgt->GetInstallNameDirForBuildTree(config);
std::string for_install = tgt->GetInstallNameDirForInstallTree(config);
Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.375.2.14
retrieving revision 1.375.2.15
diff -C 2 -d -r1.375.2.14 -r1.375.2.15
*** cmake.cxx 24 Oct 2008 15:18:55 -0000 1.375.2.14
--- cmake.cxx 2 Dec 2008 12:07:40 -0000 1.375.2.15
***************
*** 3938,3942 ****
}
}
! return cmake::VisualStudioLinkNonIncremental(expandedArgs, type, hasManifest, verbose);
}
--- 3938,3943 ----
}
}
! return cmake::VisualStudioLinkNonIncremental(expandedArgs,
! type, hasManifest, verbose);
}
Index: cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.230.2.5
retrieving revision 1.230.2.6
diff -C 2 -d -r1.230.2.5 -r1.230.2.6
*** cmMakefile.h 24 Oct 2008 15:18:52 -0000 1.230.2.5
--- cmMakefile.h 2 Dec 2008 12:07:40 -0000 1.230.2.6
***************
*** 265,269 ****
void AddCacheDefinition(const char* name, const char* value,
const char* doc,
! cmCacheManager::CacheEntryType type);
/**
--- 265,270 ----
void AddCacheDefinition(const char* name, const char* value,
const char* doc,
! cmCacheManager::CacheEntryType type,
! bool force = false);
/**
***************
*** 279,282 ****
--- 280,285 ----
*/
void RemoveDefinition(const char* name);
+ ///! Remove a definition from the cache.
+ void RemoveCacheDefinition(const char* name);
/**
Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.463.2.9
retrieving revision 1.463.2.10
diff -C 2 -d -r1.463.2.9 -r1.463.2.10
*** cmMakefile.cxx 24 Oct 2008 15:18:52 -0000 1.463.2.9
--- cmMakefile.cxx 2 Dec 2008 12:07:39 -0000 1.463.2.10
***************
*** 1562,1566 ****
void cmMakefile::AddCacheDefinition(const char* name, const char* value,
const char* doc,
! cmCacheManager::CacheEntryType type)
{
const char* val = value;
--- 1562,1567 ----
void cmMakefile::AddCacheDefinition(const char* name, const char* value,
const char* doc,
! cmCacheManager::CacheEntryType type,
! bool force)
{
const char* val = value;
***************
*** 1570,1574 ****
it.Initialized())
{
! val = it.GetValue();
if ( type == cmCacheManager::PATH || type == cmCacheManager::FILEPATH )
{
--- 1571,1580 ----
it.Initialized())
{
! // if this is not a force, then use the value from the cache
! // if it is a force, then use the value being passed in
! if(!force)
! {
! val = it.GetValue();
! }
if ( type == cmCacheManager::PATH || type == cmCacheManager::FILEPATH )
{
***************
*** 1654,1657 ****
--- 1660,1668 ----
}
+ void cmMakefile::RemoveCacheDefinition(const char* name)
+ {
+ this->GetCacheManager()->RemoveCacheEntry(name);
+ }
+
void cmMakefile::SetProjectName(const char* p)
{
More information about the Cmake-commits
mailing list