From: Omair Majid Date: Tue, 6 Jun 2017 17:28:09 +0000 (-0400) Subject: Rename CMAKE_ENABLE_CODE_COVERAGE to CLR_CMAKE_ENABLE_CODE_COVERAGE (#12106) X-Git-Tag: accepted/tizen/base/20180629.140029~1083^2~540 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=794eca076a882fcd2639fa692ca457150940231b;p=platform%2Fupstream%2Fcoreclr.git Rename CMAKE_ENABLE_CODE_COVERAGE to CLR_CMAKE_ENABLE_CODE_COVERAGE (#12106) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a6511de..365133c 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 718e9d3..9f9f28e 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 9441877..132be93 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 \