[Cmake-commits] [cmake-commits] king committed cmFindPackageCommand.cxx 1.52 1.53
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Dec 16 09:23:43 EST 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv24840/Source
Modified Files:
cmFindPackageCommand.cxx
Log Message:
BUG: find_package must push/pop policies
When the find_package command loads a <name>-version.cmake file to test
the package version it must prevent the version file from affecting
policy settings. Therefore the policy settings must be pushed and
popped.
Index: cmFindPackageCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindPackageCommand.cxx,v
retrieving revision 1.52
retrieving revision 1.53
diff -C 2 -d -r1.52 -r1.53
*** cmFindPackageCommand.cxx 9 Dec 2008 19:07:19 -0000 1.52
--- cmFindPackageCommand.cxx 16 Dec 2008 14:23:41 -0000 1.53
***************
*** 1299,1302 ****
--- 1299,1303 ----
// The version file will be loaded in an isolated scope.
this->Makefile->PushScope();
+ this->Makefile->PushPolicy();
// Clear the output variables.
***************
*** 1365,1368 ****
--- 1366,1370 ----
// Restore the original scope.
+ this->Makefile->PopPolicy();
this->Makefile->PopScope();
More information about the Cmake-commits
mailing list