Prevent broken tests related statements when BUILD_TESTING is OFF

Author: ktf

DataFormats/Detectors/Common/CMakeLists.txt

@@ -60,6 +60,6 @@ o2_add_test(CTFEntropyCoder
             COMPONENT_NAME DetectorsCommonDataFormats
             TARGETVARNAME TEST_CTF_ENTROPY_CODER
             LABELS detectorsbase)
-if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+if(BUILD_TESTING AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
         target_compile_options(${TEST_CTF_ENTROPY_CODER} PRIVATE -march=native)
 endif()

Utilities/rANS/CMakeLists.txt

@@ -51,6 +51,9 @@ if(${ENABLE_VTUNE_PROFILER})
   target_link_libraries(${LIBRANS} INTERFACE PkgConfig::Vtune)
 endif()
 
+# o2_add_test() returns early when BUILD_TESTING is off, so TARGETVARNAME is
+# never set and the target_compile_options() below would see an empty target.
+if(BUILD_TESTING)
 o2_add_test(Utils
             NAME ransUtils
             SOURCES test/test_ransUtils.cxx
@@ -186,6 +189,7 @@ o2_add_test(Serialize
             TARGETVARNAME TEST_SERIALIZE
             LABELS utils)
             target_compile_options(${TEST_SERIALIZE} PRIVATE ${RANS_TEST_ARCH})
+endif()
 
 if (TARGET benchmark::benchmark)
     o2_add_header_only_library(libransBenchmark

cmake/O2AddTest.cmake

@@ -63,10 +63,6 @@ include(O2AddExecutable)
 
 function(o2_add_test)
 
-  if(NOT BUILD_TESTING)
-    return()
-  endif()
-
   cmake_parse_arguments(
     PARSE_ARGV
     1
@@ -80,6 +76,16 @@ function(o2_add_test)
     message(FATAL_ERROR "Unexpected unparsed arguments: ${A_UNPARSED_ARGUMENTS}")
   endif()
 
+  # Parsed before this check so TARGETVARNAME can be defined (empty) even when
+  # no target is made: `if(VAR)` at the call site is then reliable, and a value
+  # left by an earlier call cannot leak into it.
+  if(NOT BUILD_TESTING)
+    if(A_TARGETVARNAME)
+      set(${A_TARGETVARNAME} "" PARENT_SCOPE)
+    endif()
+    return()
+  endif()
+
   set(testName ${ARGV0})
 
   set(linkLibraries ${A_PUBLIC_LINK_LIBRARIES})