Disable testing when using BUILD_TESTING (#1682)

69821d9e · Paul Fultz II · GitHub · cf0a6459 · 69821d9e
Commit 69821d9e authored Aug 18, 2020 by Paul Fultz II Committed by GitHub Aug 18, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

CMakeLists.txt
+9 -2

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -272,6 +272,13 @@ if(PYBIND11_INSTALL)
  endif()
 endif()

-if(PYBIND11_TEST OR (BUILD_TESTING AND PYBIND11_MASTER_PROJECT))
-  add_subdirectory(tests)
+# BUILD_TESTING takes priority, but only if this is the master project
+if(PYBIND11_MASTER_PROJECT AND DEFINED BUILD_TESTING)
+  if(BUILD_TESTING)
+    add_subdirectory(tests)
+  endif()
+else()
+  if(PYBIND11_TEST)
+    add_subdirectory(tests)
+  endif()
 endif()