فهرست منبع

Rename CMAKE_USE_MACH_PARSER to CMake_USE_MACH_PARSER

We use the `CMake_` prefix for options affecting CMake itself.
Brad King 5 سال پیش
والد
کامیت
cdcfe3eb99
4فایلهای تغییر یافته به همراه7 افزوده شده و 7 حذف شده
  1. 2 2
      Source/CMakeLists.txt
  2. 1 1
      Source/cmConfigure.cmake.h.in
  3. 2 2
      Source/cmMachO.h
  4. 2 2
      Source/cmSystemTools.cxx

+ 2 - 2
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()
 

+ 1 - 1
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@"

+ 2 - 2
Source/cmMachO.h

@@ -7,8 +7,8 @@
 #include <iosfwd>
 #include <string>
 
-#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;

+ 2 - 2
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);