diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-04 15:01:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-04 15:02:01 (GMT) |
| commit | aa45f3f25fd71f8c4f4c3caf09ae87e7641c94d1 (patch) | |
| tree | 79520870145fd88066ef7a4f50ba0d11bfbc972c | |
| parent | 4add453f9645bad13248c6ea0090871c2a33a543 (diff) | |
| parent | 1b4ab323fd620bdc81c6e4546ebaedd731b3255c (diff) | |
| download | CMake-aa45f3f25fd71f8c4f4c3caf09ae87e7641c94d1.zip CMake-aa45f3f25fd71f8c4f4c3caf09ae87e7641c94d1.tar.gz CMake-aa45f3f25fd71f8c4f4c3caf09ae87e7641c94d1.tar.bz2 | |
Merge topic 'gcc8-unused-function'
1b4ab323fd Fix build warnings for unused functions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4697
| -rw-r--r-- | Source/cmake.cxx | 2 | ||||
| -rw-r--r-- | Source/cmakemain.cxx | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index c95cf4f..057d54d 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -138,6 +138,7 @@ using JsonValueMapType = std::unordered_map<std::string, Json::Value>; static bool cmakeCheckStampFile(const std::string& stampName); static bool cmakeCheckStampList(const std::string& stampList); +#ifndef CMAKE_BOOTSTRAP static void cmWarnUnusedCliWarning(const std::string& variable, int /*unused*/, void* ctx, const char* /*unused*/, const cmMakefile* /*unused*/) @@ -145,6 +146,7 @@ static void cmWarnUnusedCliWarning(const std::string& variable, int /*unused*/, cmake* cm = reinterpret_cast<cmake*>(ctx); cm->MarkCliAsUsed(variable); } +#endif cmake::cmake(Role role, cmState::Mode mode) : FileTimeCache(cm::make_unique<cmFileTimeCache>()) diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 84d0538..2828116 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -318,6 +318,7 @@ int do_cmake(int ac, char const* const* av) return 0; } +#ifndef CMAKE_BOOTSTRAP int extract_job_number(int& index, char const* current, char const* next, int len_of_flag) { @@ -347,6 +348,7 @@ int extract_job_number(int& index, char const* current, char const* next, } return jobs; } +#endif int do_build(int ac, char const* const* av) { |