Move check before add_subdirectory

open-telemetry · Oct 20, 2024 · 4fcdbf2 · 4fcdbf2
1 parent 0875c09
commit 4fcdbf2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/api/test/CMakeLists.txt b/api/test/CMakeLists.txt
@@ -10,4 +10,7 @@ add_subdirectory(metrics)
 add_subdirectory(logs)
 add_subdirectory(common)
 add_subdirectory(baggage)
-add_subdirectory(singleton)
+
+if(NOT OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS)
+  add_subdirectory(singleton)
+endif()
diff --git a/api/test/singleton/CMakeLists.txt b/api/test/singleton/CMakeLists.txt
@@ -1,10 +1,6 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-if(OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS)
-  return()
-endif()
-
 include(GoogleTest)
 
 # Header only singletons are not available in windows yet.

diff --git a/examples/plugin/CMakeLists.txt b/examples/plugin/CMakeLists.txt
@@ -2,4 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_subdirectory(load)
-add_subdirectory(plugin)
+
+if(NOT OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS)
+  add_subdirectory(plugin)
+endif()
diff --git a/examples/plugin/plugin/CMakeLists.txt b/examples/plugin/plugin/CMakeLists.txt
@@ -1,9 +1,5 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-if(OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS)
-  return()
-endif()
-
 add_library(example_plugin SHARED tracer.cc factory_impl.cc)
 target_link_libraries(example_plugin opentelemetry_api)