diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2020-04-27 20:24:57 +0200 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2020-09-23 14:27:53 +0000 |
| commit | b698fb7639b5aeef86c5c5a870ce04f80e5e2042 (patch) | |
| tree | bd601dbf9eb5d51834002ed09428764f823127f5 | |
| parent | bc7123534d0dd58ab4e3ca6b0146b67c71adb283 (diff) | |
cmake: move up checking DBUS_ENABLE_EMBEDDED_TESTS from subdir test/name-test to test
The whole file is only added with the mentioned variable
set, so it can also be skipped completly one level up.
| -rw-r--r-- | test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/name-test/CMakeLists.txt | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f78bba54..00042000 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,7 +13,9 @@ add_library(dbus-testutils STATIC ) target_link_libraries(dbus-testutils ${DBUS_INTERNAL_LIBRARIES}) -add_subdirectory( name-test ) +if(DBUS_ENABLE_EMBEDDED_TESTS) + add_subdirectory( name-test ) +endif() set(manual-dir-iter_SOURCES manual-dir-iter.c diff --git a/test/name-test/CMakeLists.txt b/test/name-test/CMakeLists.txt index 32f060a2..7058d696 100644 --- a/test/name-test/CMakeLists.txt +++ b/test/name-test/CMakeLists.txt @@ -1,5 +1,3 @@ -if(DBUS_ENABLE_EMBEDDED_TESTS) - add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS}) add_helper_executable(test-autolaunch test-autolaunch.c dbus-testutils) @@ -14,4 +12,3 @@ add_session_test_executable(test-shutdown test-shutdown.c dbus-testutils) if (ENABLE_TRADITIONAL_ACTIVATION) add_session_test_executable(test-thread-init test-threads-init.c ${DBUS_INTERNAL_LIBRARIES}) endif() -endif() |