Respond to PR comments.

acquire-project · Oct 25, 2024 · 5f2b2ea · 5f2b2ea
1 parent 2f1660b
commit 5f2b2ea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,14 +19,20 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-option(NOTEST "Disable all tests" OFF)
 option(NO_UNIT_TESTS "Disable unit tests" OFF)
 option(WITH_EXAMPLES "Build examples" OFF)
 
+if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    include(CTest)
+endif ()
+
 add_subdirectory(src)
-if (NOT NOTEST)
+if (BUILD_TESTING)
     add_subdirectory(tests)
+else ()
+    message(STATUS "Skipping test targets")
 endif ()
+
 if (WITH_EXAMPLES)
     add_subdirectory(examples)
 endif ()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,4 +1,5 @@
 if (NOT TARGET acquire-core-logger)
+    set(NOTEST ON)
     add_subdirectory(${CMAKE_SOURCE_DIR}/acquire-common/acquire-core-libs ${CMAKE_CURRENT_BINARY_DIR}/acquire-core-libs)
 endif ()
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,6 +1,5 @@
-set(NOTEST "TRUE")
+set(NOTEST ON)
 add_subdirectory(${CMAKE_SOURCE_DIR}/acquire-common ${CMAKE_CURRENT_BINARY_DIR}/acquire-common)
-set(NOTEST "FALSE")
 
 #
 # PARAMETERS