diff options
author | Brad King <brad.king@kitware.com> | 2021-02-01 18:29:51 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2021-02-03 16:35:31 (GMT) |
commit | b6071c93f556a2ee1ad30eae0f3a1dbbb5b5a1d7 (patch) | |
tree | b5057dae0a34d439afaa0f51293a56acf2e3b409 /Source | |
parent | c28dbd7e308968089bf97df71d4fd74c99e718f1 (diff) | |
download | CMake-b6071c93f556a2ee1ad30eae0f3a1dbbb5b5a1d7.zip CMake-b6071c93f556a2ee1ad30eae0f3a1dbbb5b5a1d7.tar.gz CMake-b6071c93f556a2ee1ad30eae0f3a1dbbb5b5a1d7.tar.bz2 |
Rename CMAKE_USE_ELF_PARSER to CMake_USE_ELF_PARSER
We use the `CMake_` prefix for options affecting CMake itself.
Diffstat (limited to 'Source')
-rw-r--r-- | Source/CMakeLists.txt | 10 | ||||
-rw-r--r-- | Source/cmConfigure.cmake.h.in | 2 | ||||
-rw-r--r-- | Source/cmELF.h | 4 | ||||
-rw-r--r-- | Source/cmFileCommand.cxx | 4 | ||||
-rw-r--r-- | Source/cmGeneratorTarget.cxx | 2 | ||||
-rw-r--r-- | Source/cmSystemTools.cxx | 14 |
6 files changed, 18 insertions, 18 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index b3d8369..c2e1ed3 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -19,7 +19,7 @@ else() CHECK_INCLUDE_FILE("elf.h" HAVE_ELF_H) endif() if(HAVE_ELF_H) - set(CMAKE_USE_ELF_PARSER 1) + set(CMake_USE_ELF_PARSER 1) elseif(HAIKU) # On Haiku, we need to include elf32.h from the private headers set(CMake_HAIKU_INCLUDE_DIRS @@ -32,13 +32,13 @@ elseif(HAIKU) unset(CMAKE_REQUIRED_INCLUDES) if(HAVE_ELF32_H) - set(CMAKE_USE_ELF_PARSER 1) + set(CMake_USE_ELF_PARSER 1) else() unset(CMake_HAIKU_INCLUDE_DIRS) - set(CMAKE_USE_ELF_PARSER) + set(CMake_USE_ELF_PARSER) endif() else() - set(CMAKE_USE_ELF_PARSER) + set(CMake_USE_ELF_PARSER) endif() if(NOT CMake_DEFAULT_RECURSION_LIMIT) @@ -108,7 +108,7 @@ include_directories( ) # Check if we can build the ELF parser. -if(CMAKE_USE_ELF_PARSER) +if(CMake_USE_ELF_PARSER) set(ELF_SRCS cmELF.h cmELF.cxx) endif() diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index cf32b05..9b785b9 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -16,7 +16,7 @@ #cmakedefine HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE #cmakedefine HAVE_UNSETENV -#cmakedefine CMAKE_USE_ELF_PARSER +#cmakedefine CMake_USE_ELF_PARSER #cmakedefine CMAKE_USE_MACH_PARSER #define CMake_DEFAULT_RECURSION_LIMIT @CMake_DEFAULT_RECURSION_LIMIT@ #define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@" diff --git a/Source/cmELF.h b/Source/cmELF.h index 99eb4f4..c479e2b 100644 --- a/Source/cmELF.h +++ b/Source/cmELF.h @@ -10,8 +10,8 @@ #include <utility> #include <vector> -#if !defined(CMAKE_USE_ELF_PARSER) -# error "This file may be included only if CMAKE_USE_ELF_PARSER is enabled." +#if !defined(CMake_USE_ELF_PARSER) +# error "This file may be included only if CMake_USE_ELF_PARSER is enabled." #endif class cmELFInternal; diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 031e0d7..f674833 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -64,7 +64,7 @@ # include "cmFileLockResult.h" #endif -#if defined(CMAKE_USE_ELF_PARSER) +#if defined(CMake_USE_ELF_PARSER) # include "cmELF.h" #endif @@ -1198,7 +1198,7 @@ bool HandleReadElfCommand(std::vector<std::string> const& args, return false; } -#if defined(CMAKE_USE_ELF_PARSER) +#if defined(CMake_USE_ELF_PARSER) cmELF elf(fileNameArg.c_str()); if (!arguments.RPath.empty()) { diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index aaefe9c..9a70b16 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -2059,7 +2059,7 @@ bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const return true; } -#if defined(CMAKE_USE_ELF_PARSER) +#if defined(CMake_USE_ELF_PARSER) // Enable if the rpath flag uses a separator and the target uses ELF // binaries. std::string ll = this->GetLinkerLanguage(config); diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 18c266f..95e2a35 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -45,7 +45,7 @@ # include "cmCryptoHash.h" #endif -#if defined(CMAKE_USE_ELF_PARSER) +#if defined(CMake_USE_ELF_PARSER) # include "cmELF.h" #endif @@ -2317,7 +2317,7 @@ bool cmSystemTools::GuessLibrarySOName(std::string const& fullPath, { // For ELF shared libraries use a real parser to get the correct // soname. -#if defined(CMAKE_USE_ELF_PARSER) +#if defined(CMake_USE_ELF_PARSER) cmELF elf(fullPath.c_str()); if (elf) { return elf.GetSOName(soname); @@ -2360,7 +2360,7 @@ bool cmSystemTools::GuessLibraryInstallName(std::string const& fullPath, return false; } -#if defined(CMAKE_USE_ELF_PARSER) +#if defined(CMake_USE_ELF_PARSER) std::string::size_type cmSystemToolsFindRPath(std::string const& have, std::string const& want) { @@ -2394,7 +2394,7 @@ std::string::size_type cmSystemToolsFindRPath(std::string const& have, } #endif -#if defined(CMAKE_USE_ELF_PARSER) +#if defined(CMake_USE_ELF_PARSER) struct cmSystemToolsRPathInfo { unsigned long Position; @@ -2404,7 +2404,7 @@ struct cmSystemToolsRPathInfo }; #endif -#if defined(CMAKE_USE_ELF_PARSER) +#if defined(CMake_USE_ELF_PARSER) bool cmSystemTools::ChangeRPath(std::string const& file, std::string const& oldRPath, std::string const& newRPath, @@ -2720,7 +2720,7 @@ int cmSystemTools::strverscmp(std::string const& lhs, std::string const& rhs) return cm_strverscmp(lhs.c_str(), rhs.c_str()); } -#if defined(CMAKE_USE_ELF_PARSER) +#if defined(CMake_USE_ELF_PARSER) bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg, bool* removed) { @@ -2872,7 +2872,7 @@ bool cmSystemTools::RemoveRPath(std::string const& /*file*/, bool cmSystemTools::CheckRPath(std::string const& file, std::string const& newRPath) { -#if defined(CMAKE_USE_ELF_PARSER) +#if defined(CMake_USE_ELF_PARSER) // Parse the ELF binary. cmELF elf(file.c_str()); |