Skip to content

Commit 4fcdbf2

Browse files
committed
Move check before add_subdirectory
1 parent 0875c09 commit 4fcdbf2

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

api/test/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,7 @@ add_subdirectory(metrics)
1010
add_subdirectory(logs)
1111
add_subdirectory(common)
1212
add_subdirectory(baggage)
13-
add_subdirectory(singleton)
13+
14+
if(NOT OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS)
15+
add_subdirectory(singleton)
16+
endif()

api/test/singleton/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
if(OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS)
5-
return()
6-
endif()
7-
84
include(GoogleTest)
95

106
# Header only singletons are not available in windows yet.

examples/plugin/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
add_subdirectory(load)
5-
add_subdirectory(plugin)
5+
6+
if(NOT OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS)
7+
add_subdirectory(plugin)
8+
endif()
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
33

4-
if(OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS)
5-
return()
6-
endif()
7-
84
add_library(example_plugin SHARED tracer.cc factory_impl.cc)
95
target_link_libraries(example_plugin opentelemetry_api)

0 commit comments

Comments
 (0)