Rename CMAKE_ENABLE_CODE_COVERAGE to CLR_CMAKE_ENABLE_CODE_COVERAGE (dotnet/coreclr...

Commit migrated from https://github.com/dotnet/coreclr/commit/794eca076a882fcd2639fa692ca457150940231b

diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
index a6511de..365133c 100644 (file)
--- a/src/coreclr/CMakeLists.txt
+++ b/src/coreclr/CMakeLists.txt
@@ -31,7 +31,7 @@ if(CORECLR_SET_RPATH)
     set(MACOSX_RPATH ON)
 endif(CORECLR_SET_RPATH)
 
-OPTION(CMAKE_ENABLE_CODE_COVERAGE "Enable code coverage" OFF)
+OPTION(CLR_CMAKE_ENABLE_CODE_COVERAGE "Enable code coverage" OFF)
 OPTION(CLR_CMAKE_WARNINGS_ARE_ERRORS "Warnings are errors" ON)
 
 # Ensure that python is present

diff --git a/src/coreclr/compileoptions.cmake b/src/coreclr/compileoptions.cmake
index 718e9d3..9f9f28e 100644 (file)
--- a/src/coreclr/compileoptions.cmake
+++ b/src/coreclr/compileoptions.cmake
@@ -123,7 +123,7 @@ if (WIN32)
   
 endif (WIN32)
 
-if(CMAKE_ENABLE_CODE_COVERAGE)
+if(CLR_CMAKE_ENABLE_CODE_COVERAGE)
 
   if(CLR_CMAKE_PLATFORM_UNIX)
     string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_CMAKE_BUILD_TYPE)
@@ -140,4 +140,4 @@ if(CMAKE_ENABLE_CODE_COVERAGE)
     message(FATAL_ERROR "Code coverage builds not supported on current platform")
   endif(CLR_CMAKE_PLATFORM_UNIX)
 
-endif(CMAKE_ENABLE_CODE_COVERAGE)
+endif(CLR_CMAKE_ENABLE_CODE_COVERAGE)

diff --git a/src/coreclr/src/pal/tools/gen-buildsys-clang.sh b/src/coreclr/src/pal/tools/gen-buildsys-clang.sh
index 9441877..132be93 100755 (executable)
--- a/src/coreclr/src/pal/tools/gen-buildsys-clang.sh
+++ b/src/coreclr/src/pal/tools/gen-buildsys-clang.sh
@@ -173,8 +173,8 @@ cmake \
   "-DCMAKE_NM=$llvm_nm" \
   "-DCMAKE_OBJDUMP=$llvm_objdump" \
   "-DCMAKE_BUILD_TYPE=$buildtype" \
-  "-DCMAKE_ENABLE_CODE_COVERAGE=$code_coverage" \
   "-DCMAKE_EXPORT_COMPILE_COMMANDS=1 " \
+  "-DCLR_CMAKE_ENABLE_CODE_COVERAGE=$code_coverage" \
   "-DCLR_CMAKE_BUILD_TESTS=$build_tests" \
   $cmake_extra_defines \
   $__UnprocessedCMakeArgs \