summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2001-07-10 16:09:18 (GMT)
committerBrad King <brad.king@kitware.com>2001-07-10 16:09:18 (GMT)
commitfdd48818db9c98d81afb4d4f7eec1efd1bdc0376 (patch)
treedc2a27e3aa9a67b83a526b706df44c50a1b49cf7
parent2ba4fc285be5608aad0f00f2e34994c03340241f (diff)
downloadCMake-fdd48818db9c98d81afb4d4f7eec1efd1bdc0376.zip
CMake-fdd48818db9c98d81afb4d4f7eec1efd1bdc0376.tar.gz
CMake-fdd48818db9c98d81afb4d4f7eec1efd1bdc0376.tar.bz2
ENH: Removing automatic setting of BUILD_SHARED_LIBS. Projects that support this should explicitly declare it with the OPTION command, or set its libraries to shared or static directly on each ADD_LIBRARY command.
-rw-r--r--Source/cmake.cxx10
1 files changed, 1 insertions, 9 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 4fe0f11..9bab508 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -286,7 +286,6 @@ int cmake::Generate(const std::vector<std::string>& args)
// so users can edit the values in the cache:
// LIBRARY_OUTPUT_PATH
// EXECUTABLE_OUTPUT_PATH
- // BUILD_SHARED_LIBS
if(!cmCacheManager::GetInstance()->GetCacheValue("LIBRARY_OUTPUT_PATH"))
{
cmCacheManager::GetInstance()->AddCacheEntry("LIBRARY_OUTPUT_PATH", "",
@@ -298,14 +297,7 @@ int cmake::Generate(const std::vector<std::string>& args)
cmCacheManager::GetInstance()->AddCacheEntry("EXECUTABLE_OUTPUT_PATH", "",
"Single output directory for building all executables.",
cmCacheManager::PATH);
- }
- if(!cmCacheManager::GetInstance()->GetCacheValue("BUILD_SHARED_LIBS"))
- {
- cmCacheManager::GetInstance()->AddCacheEntry("BUILD_SHARED_LIBS", "OFF",
- "Build with shared libraries.",
- cmCacheManager::BOOL);
- }
-
+ }
cmCacheManager::GetInstance()->SaveCache(&mf);