Namespace CMake tests with project name and update CMake find module

Author: awvwgk

README.md

@@ -310,10 +310,8 @@ target_link_libraries(
   "test-drive::test-drive"
 )
 
-add_test("all-tests" "${PROJECT_NAME}-tester")
-
 foreach(t IN LISTS tests)
-  add_test("${t}" "${PROJECT_NAME}-tester" "${t}")
+  add_test("${PROJECT_NAME}/${t}" "${PROJECT_NAME}-tester" "${t}")
 endforeach()
 ```
 
@@ -323,6 +321,57 @@ endforeach()
 The following module allows to find or fetch an installation of this project in CMake
 
 ```cmake
+#[[.rst:
+Find test-drive
+---------------
+
+Makes the test-drive project available.
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+This module provides the following imported target, if found:
+
+``test-drive::test-drive``
+  The test-drive library
+
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module will define the following variables:
+
+``TEST_DRIVE_FOUND``
+  True if the test-drive library is available
+
+``TEST_DRIVE_SOURCE_DIR``
+  Path to the source directory of the test-drive project,
+  only set if the project is included as source.
+
+``TEST_DRIVE_BINARY_DIR``
+  Path to the binary directory of the test-drive project,
+  only set if the project is included as source.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may be set to influence the library detection:
+
+``TEST_DRIVE_FIND_METHOD``
+  Methods to find or make the project available. Available methods are
+  - ``cmake``: Try to find via CMake config file
+  - ``pkgconf``: Try to find via pkg-config file
+  - ``subproject``: Use source in subprojects directory
+  - ``fetch``: Fetch the source from upstream
+
+``TEST_DRIVE_DIR``
+  Used for searching the CMake config file
+
+``TEST_DRIVE_SUBPROJECT``
+  Directory to find the test-drive subproject, relative to the project root
+
+#]]
+
 set(_lib "test-drive")
 set(_pkg "TEST_DRIVE")
 set(_url "https://github.com/fortran-lang/test-drive")
@@ -343,6 +392,10 @@ foreach(method ${${_pkg}_FIND_METHOD})
 
   if("${method}" STREQUAL "cmake")
     message(STATUS "${_lib}: Find installed package")
+    if(DEFINED "${_pkg}_DIR")
+      set("_${_pkg}_DIR")
+      set("${_lib}_DIR" "${_pkg}_DIR")
+    endif()
     find_package("${_lib}" CONFIG)
     if("${_lib}_FOUND")
       message(STATUS "${_lib}: Found installed package")
@@ -367,19 +420,24 @@ foreach(method ${${_pkg}_FIND_METHOD})
         INTERFACE
         "${${_pkg}_INCLUDE_DIRS}"
         )
+
       break()
     endif()
   endif()
 
   if("${method}" STREQUAL "subproject")
-    set("${_pkg}_SOURCE_DIR" "${PROJECT_SOURCE_DIR}/subprojects/${_lib}")
-    set("${_pkg}_BINARY_DIR" "${PROJECT_BINARY_DIR}/subprojects/${_lib}")
+    if(NOT DEFINED "${_pkg}_SUBPROJECT")
+      set("_${_pkg}_SUBPROJECT")
+      set("${_pkg}_SUBPROJECT" "subprojects/${_lib}")
+    endif()
+    set("${_pkg}_SOURCE_DIR" "${PROJECT_SOURCE_DIR}/${${_pkg}_SUBPROJECT}")
+    set("${_pkg}_BINARY_DIR" "${PROJECT_BINARY_DIR}/${${_pkg}_SUBPROJECT}")
     if(EXISTS "${${_pkg}_SOURCE_DIR}/CMakeLists.txt")
-      message(STATUS "Include ${_lib} from subprojects")
+      message(STATUS "Include ${_lib} from ${${_pkg}_SUBPROJECT}")
       add_subdirectory(
         "${${_pkg}_SOURCE_DIR}"
         "${${_pkg}_BINARY_DIR}"
-        )
+      )
 
       add_library("${_lib}::${_lib}" INTERFACE IMPORTED)
       target_link_libraries("${_lib}::${_lib}" INTERFACE "${_lib}")
@@ -407,6 +465,7 @@ foreach(method ${${_pkg}_FIND_METHOD})
     target_link_libraries("${_lib}::${_lib}" INTERFACE "${_lib}")
 
     # We need the module directory in the subproject before we finish the configure stage
+    FetchContent_GetProperties("${_lib}" SOURCE_DIR "${_pkg}_SOURCE_DIR")
     FetchContent_GetProperties("${_lib}" BINARY_DIR "${_pkg}_BINARY_DIR")
     if(NOT EXISTS "${${_pkg}_BINARY_DIR}/include")
       make_directory("${${_pkg}_BINARY_DIR}/include")
@@ -417,10 +476,20 @@ foreach(method ${${_pkg}_FIND_METHOD})
 
 endforeach()
 
-if(NOT TARGET "${_lib}::${_lib}")
-  message(FATAL_ERROR "Could not find dependency ${_lib}")
+if(TARGET "${_lib}::${_lib}")
+  set("${_pkg}_FOUND" TRUE)
+else()
+  set("${_pkg}_FOUND" FALSE)
 endif()
 
+if(DEFINED "_${_pkg}_SUBPROJECT")
+  unset("${_pkg}_SUBPROJECT")
+  unset("_${_pkg}_SUBPROJECT")
+endif()
+if(DEFINED "_${_pkg}_DIR")
+  unset("${_lib}_DIR")
+  unset("_${_pkg}_DIR")
+endif()
 if(DEFINED "_${_pkg}_FIND_METHOD")
   unset("${_pkg}_FIND_METHOD")
   unset("_${_pkg}_FIND_METHOD")

test/CMakeLists.txt

@@ -36,8 +36,8 @@ target_link_libraries(
   "${PROJECT_NAME}-lib"
 )
 
-add_test("all-tests" "${PROJECT_NAME}-tester")
+add_test("${PROJECT_NAME}/all-tests" "${PROJECT_NAME}-tester")
 
 foreach(t IN LISTS tests)
-  add_test("${t}" "${PROJECT_NAME}-tester" "${t}")
+  add_test("${PROJECT_NAME}/${t}" "${PROJECT_NAME}-tester" "${t}")
 endforeach()