summaryrefslogtreecommitdiffstats
path: root/Source/cmOptionCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-10-08 18:56:15 (GMT)
committerBrad King <brad.king@kitware.com>2009-10-08 18:56:15 (GMT)
commit9a77f65da7d3275760a60d0a6180a9c240ba30e5 (patch)
tree7326f55451af5e372483a512caaa44906a67570a /Source/cmOptionCommand.cxx
parent24bf97440fc8730860620c65d9dfd487ca68c69d (diff)
downloadCMake-9a77f65da7d3275760a60d0a6180a9c240ba30e5.zip
CMake-9a77f65da7d3275760a60d0a6180a9c240ba30e5.tar.gz
CMake-9a77f65da7d3275760a60d0a6180a9c240ba30e5.tar.bz2
Remove CMake Policy CMP0015 until it is revised
We revert commit "Create CMake Policy CMP0015 to fix set(CACHE)" because the NEW behavior of the policy breaks a valid use case: # CMakeLists.txt option(BUILD_SHARED_LIBS "..." ON) add_library(mylib ...) set(BUILD_SHARED_LIBS OFF) # we want only mylib to be shared add_subdirectory(ThirdParty) # ThirdParty/CMakeLists.txt option(BUILD_SHARED_LIBS "..." ON) # uh, oh, with NEW behavior this dir uses shared libs!!! We'll re-introduce the policy later with a different change in behavior to resolve the motivating case, which was more subtle but less common. See issue #9008.
Diffstat (limited to 'Source/cmOptionCommand.cxx')
-rw-r--r--Source/cmOptionCommand.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/cmOptionCommand.cxx b/Source/cmOptionCommand.cxx
index c3ec266..af9d94b 100644
--- a/Source/cmOptionCommand.cxx
+++ b/Source/cmOptionCommand.cxx
@@ -53,7 +53,6 @@ bool cmOptionCommand
if ( it.GetType() != cmCacheManager::UNINITIALIZED )
{
it.SetProperty("HELPSTRING", args[1].c_str());
- this->Makefile->UseCacheDefinition(it);
return true;
}
if ( it.GetValue() )