summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWouter Klouwen <wouter.klouwen@youview.com>2020-04-27 19:05:21 (GMT)
committerWouter Klouwen <wouter.klouwen@youview.com>2020-05-01 11:54:21 (GMT)
commit1b4ab323fd620bdc81c6e4546ebaedd731b3255c (patch)
tree1c0d40b4597e7c6a916de21cce4f06b49509600e
parentc09efe074d793203ab846e97bde8d03e4714dc2a (diff)
downloadCMake-1b4ab323fd620bdc81c6e4546ebaedd731b3255c.zip
CMake-1b4ab323fd620bdc81c6e4546ebaedd731b3255c.tar.gz
CMake-1b4ab323fd620bdc81c6e4546ebaedd731b3255c.tar.bz2
Fix build warnings for unused functions
This commit addresses two sources of build errors when using the warning flag -Werror=unused-function for GCC in the default compiler flags. The affected functions are not used when building in bootstrap mode and therefore should be ifdefed out. No functional changes.
-rw-r--r--Source/cmake.cxx2
-rw-r--r--Source/cmakemain.cxx2
2 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index c619e1e..d81f975 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)
{