Remove dead CMake options (#7847)

Author: eddyashton

CMakeLists.txt

@@ -60,8 +60,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 find_package(Threads REQUIRED)
 
-option(PROFILE_TESTS "Profile tests" OFF)
-
 if("$ENV{CI}" STREQUAL "")
   set(PYTHON unbuffer python3)
 else()

cmake/common.cmake

@@ -97,21 +97,7 @@ function(add_e2e_test)
   endif()
 
   if(BUILD_END_TO_END_TESTS)
-    if(PROFILE_TESTS)
-      set(
-        PYTHON_WRAPPER
-        py-spy
-        record
-        --format
-        speedscope
-        -o
-        ${PARSED_ARGS_NAME}.trace
-        --
-        python3
-      )
-    else()
-      set(PYTHON_WRAPPER ${PYTHON})
-    endif()
+    set(PYTHON_WRAPPER ${PYTHON})
 
     # For fast e2e runs, tick node faster than default value (except for
     # instrumented builds which may process ticks slower).

cmake/preproject.cmake

@@ -15,13 +15,6 @@ if(
   find_program(FOUND_CMAKE_C_COMPILER NAMES clang)
   find_program(FOUND_CMAKE_CXX_COMPILER NAMES clang++)
 
-  # vvvvv Ubuntu-20.04, to be removed after support dropped. vvvvv #
-  if(NOT (FOUND_CMAKE_C_COMPILER AND FOUND_CMAKE_CXX_COMPILER))
-    find_program(FOUND_CMAKE_C_COMPILER NAMES clang-15)
-    find_program(FOUND_CMAKE_CXX_COMPILER NAMES clang++-15)
-  endif()
-  # ^^^^^ Ubuntu-20.04, to be removed after support dropped. ^^^^^ #
-
   if(NOT (FOUND_CMAKE_C_COMPILER AND FOUND_CMAKE_CXX_COMPILER))
     message(
       WARNING
@@ -63,11 +56,12 @@ if(FUZZING AND TSAN)
   message(FATAL_ERROR "FUZZING and TSAN cannot be enabled together")
 endif()
 
-option(COLORED_OUTPUT "Always produce ANSI-colored output." ON)
-
-if(${COLORED_OUTPUT})
-  add_compile_options(-fcolor-diagnostics)
-endif()
+add_compile_options(
+  $<$<COMPILE_LANG_AND_ID:C,Clang>:-fcolor-diagnostics>
+  $<$<COMPILE_LANG_AND_ID:CXX,Clang>:-fcolor-diagnostics>
+  $<$<COMPILE_LANG_AND_ID:C,GNU>:-fdiagnostics-color=always>
+  $<$<COMPILE_LANG_AND_ID:CXX,GNU>:-fdiagnostics-color=always>
+)
 
 function(add_warning_checks name)
   target_compile_options(

cmake/quickjs.cmake

@@ -1,12 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the Apache 2.0 License.
 
-set(
-  QUICKJS_PREFIX
-  ${CCF_3RD_PARTY_EXPORTED_DIR}/quickjs
-  CACHE PATH
-  "Prefix to the QuickJS library"
-)
+set(QUICKJS_PREFIX ${CCF_3RD_PARTY_EXPORTED_DIR}/quickjs)
 
 set(QUICKJS_INC ${QUICKJS_PREFIX})