2 files changed, 25 insertions, 26 deletions
diff --git a/testpar/API/CMakeLists.txt b/testpar/API/CMakeLists.txt
index 5eb69c4..e907078 100644
--- a/testpar/API/CMakeLists.txt
+++ b/testpar/API/CMakeLists.txt
@@ -9,16 +9,31 @@
 # help@hdfgroup.org.
 #
 
-#------------------------------------------------------------------------------
-# Set module path
-#------------------------------------------------------------------------------
-set(HDF5_TEST_API_CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${HDF5_TEST_API_CMAKE_MODULE_PATH})
+cmake_minimum_required (VERSION 3.18)
+project (HDF5_TEST_PAR_API C)
 
 #------------------------------------------------------------------------------
-# Setup for API tests
+# Define for API tests
 #------------------------------------------------------------------------------
 
+set (HDF5_API_TESTS
+  attribute
+  dataset
+  datatype
+  file
+  group
+  link
+  misc
+  object
+)
+
+if (HDF5_TEST_API_ENABLE_ASYNC)
+  set (HDF5_API_TESTS
+    ${HDF5_API_TESTS}
+    async
+  )
+endif ()
+
 # Ported HDF5 tests
 set (HDF5_API_PAR_TESTS_EXTRA
   t_bigio
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt
index d34b800..6bb5fa6 100644
--- a/testpar/CMakeLists.txt
+++ b/testpar/CMakeLists.txt
@@ -104,30 +104,14 @@ set (H5P_TESTS
     t_vfd
 )
 
-set (HDF5_API_TESTS
-  attribute
-  dataset
-  datatype
-  file
-  group
-  link
-  misc
-  object
-)
-
-if (HDF5_TEST_API_ENABLE_ASYNC)
-  set (HDF5_API_TESTS
-    ${HDF5_API_TESTS}
-    async
-  )
-endif ()
-
 foreach (h5_testp ${H5P_TESTS})
   ADD_H5P_EXE(${h5_testp})
 endforeach ()
 
-add_subdirectory (API)
-
 if (HDF5_TEST_PARALLEL)
   include (CMakeTests.cmake)
 endif ()
+
+if (HDF5_TEST_API)
+  add_subdirectory (API)
+endif ()