diff options
author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-04-29 14:04:05 (GMT) |
---|---|---|
committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2003-04-29 14:04:05 (GMT) |
commit | e72535fda75454433d543c771bc5402cd238d3ed (patch) | |
tree | 44bea2b1e5385dbdd676d58f13ee55075b891a68 /Source | |
parent | 42db1870120481bbd75dd1b056bc7909c2da9232 (diff) | |
download | CMake-e72535fda75454433d543c771bc5402cd238d3ed.zip CMake-e72535fda75454433d543c771bc5402cd238d3ed.tar.gz CMake-e72535fda75454433d543c771bc5402cd238d3ed.tar.bz2 |
ENH: Add additional optional argument to Run. If it is true, it will only set paths and load cache. It will not do configure and gfenerate
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmake.cxx | 7 | ||||
-rw-r--r-- | Source/cmake.h | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index f3e355b..96902ab 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -909,7 +909,7 @@ bool cmake::CacheVersionMatches() } // handle a command line invocation -int cmake::Run(const std::vector<std::string>& args) +int cmake::Run(const std::vector<std::string>& args, bool noconfigure) { // Process the arguments this->SetArgs(args); @@ -941,6 +941,11 @@ int cmake::Run(const std::vector<std::string>& args) std::string systemFile = this->GetHomeOutputDirectory(); systemFile += "/CMakeSystem.cmake"; + if ( noconfigure ) + { + return 0; + } + int ret = 0; // if not local or the cmake version has changed since the last run // of cmake, or CMakeSystem.cmake file is not in the root binary diff --git a/Source/cmake.h b/Source/cmake.h index ab7a15b..376a71d 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -119,7 +119,9 @@ class cmake /** * Handle a command line invocation of cmake. */ - int Run(const std::vector<std::string>&args); + int Run(const std::vector<std::string>&args) + { this->Run(args, false); } + int Run(const std::vector<std::string>&args, bool noconfigure); /** * Generate the SourceFilesList from the SourceLists. This should only be |