From cdcfe3eb99f2471740dccdbbef5c47414c15e661 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 1 Feb 2021 13:31:02 -0500 Subject: Rename CMAKE_USE_MACH_PARSER to CMake_USE_MACH_PARSER We use the `CMake_` prefix for options affecting CMake itself. --- Source/CMakeLists.txt | 4 ++-- Source/cmConfigure.cmake.h.in | 2 +- Source/cmMachO.h | 4 ++-- Source/cmSystemTools.cxx | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index c2e1ed3..26aaa79 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -54,7 +54,7 @@ if(NOT CMake_DEFAULT_RECURSION_LIMIT) endif() if(APPLE) - set(CMAKE_USE_MACH_PARSER 1) + set(CMake_USE_MACH_PARSER 1) endif() set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR}) @@ -113,7 +113,7 @@ if(CMake_USE_ELF_PARSER) endif() # Check if we can build the Mach-O parser. -if(CMAKE_USE_MACH_PARSER) +if(CMake_USE_MACH_PARSER) set(MACH_SRCS cmMachO.h cmMachO.cxx) endif() diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index 9b785b9..2fef246 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -17,7 +17,7 @@ #cmakedefine HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE #cmakedefine HAVE_UNSETENV #cmakedefine CMake_USE_ELF_PARSER -#cmakedefine CMAKE_USE_MACH_PARSER +#cmakedefine CMake_USE_MACH_PARSER #define CMake_DEFAULT_RECURSION_LIMIT @CMake_DEFAULT_RECURSION_LIMIT@ #define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@" #define CMAKE_DATA_DIR "/@CMAKE_DATA_DIR@" diff --git a/Source/cmMachO.h b/Source/cmMachO.h index be92c95..faa024b 100644 --- a/Source/cmMachO.h +++ b/Source/cmMachO.h @@ -7,8 +7,8 @@ #include #include -#if !defined(CMAKE_USE_MACH_PARSER) -# error "This file may be included only if CMAKE_USE_MACH_PARSER is enabled." +#if !defined(CMake_USE_MACH_PARSER) +# error "This file may be included only if CMake_USE_MACH_PARSER is enabled." #endif class cmMachOInternal; diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 95e2a35..8c5a657 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -49,7 +49,7 @@ # include "cmELF.h" #endif -#if defined(CMAKE_USE_MACH_PARSER) +#if defined(CMake_USE_MACH_PARSER) # include "cmMachO.h" #endif @@ -2347,7 +2347,7 @@ bool cmSystemTools::GuessLibrarySOName(std::string const& fullPath, bool cmSystemTools::GuessLibraryInstallName(std::string const& fullPath, std::string& soname) { -#if defined(CMAKE_USE_MACH_PARSER) +#if defined(CMake_USE_MACH_PARSER) cmMachO macho(fullPath.c_str()); if (macho) { return macho.GetInstallName(soname); -- cgit v0.12