diff options
author | Omair Majid <omair.majid@gmail.com> | 2017-06-06 13:28:09 -0400 |
---|---|---|
committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-06-06 19:28:09 +0200 |
commit | 794eca076a882fcd2639fa692ca457150940231b (patch) | |
tree | c815b812de47367bd55cbd7fd4f8ab3655427171 | |
parent | b23a11e834074e3e030b42fc8d93083e15b7545d (diff) | |
download | coreclr-794eca076a882fcd2639fa692ca457150940231b.tar.gz coreclr-794eca076a882fcd2639fa692ca457150940231b.tar.bz2 coreclr-794eca076a882fcd2639fa692ca457150940231b.zip |
Rename CMAKE_ENABLE_CODE_COVERAGE to CLR_CMAKE_ENABLE_CODE_COVERAGE (#12106)
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | compileoptions.cmake | 4 | ||||
-rwxr-xr-x | src/pal/tools/gen-buildsys-clang.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a6511de47c..365133c39d 100644 --- a/CMakeLists.txt +++ b/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/compileoptions.cmake b/compileoptions.cmake index 718e9d34f1..9f9f28eaf5 100644 --- a/compileoptions.cmake +++ b/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/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh index 944187786f..132be93c7d 100755 --- a/src/pal/tools/gen-buildsys-clang.sh +++ b/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 \ |