switched last test to Catch2

CMakeLists.txt

@@ -356,8 +356,8 @@ if(CIFPP_DOWNLOAD_CCD)
 endif()
 endif()
 
 
 # Installation directories
 # Installation directories
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.22)
-	cmake_dependent_option(CIFPP_DATA_DIR "Directory where dictionary and other static data is stored" CACHE PATH "${CMAKE_INSTALL_FULL_DATADIR}/libcifpp" "BUILD_FOR_CCP4" "$ENV{CCP4}/share/libcifpp")
+if(BUILD_FOR_CCP4)
+	option(CIFPP_DATA_DIR "Directory where dictionary and other static data is stored" "$ENV{CCP4}/share/libcifpp")
 else()
 else()
 	option(CIFPP_DATA_DIR "Directory where dictionary and other static data is stored" "${CMAKE_INSTALL_FULL_DATADIR}/libcifpp")
 	option(CIFPP_DATA_DIR "Directory where dictionary and other static data is stored" "${CMAKE_INSTALL_FULL_DATADIR}/libcifpp")
 endif()
 endif()
@@ -489,7 +489,7 @@ if(BUILD_TESTING)
 	endif()
 	endif()
 
 
 	list(APPEND CIFPP_tests
 	list(APPEND CIFPP_tests
-		# unit-v2
+		unit-v2
 		unit-3d
 		unit-3d
 		format
 		format
 		model
 		model
@@ -543,7 +543,7 @@ if(CIFPP_INSTALL_UPDATE_SCRIPT)
 	install(DIRECTORY DESTINATION ${CIFPP_CACHE_DIR})
 	install(DIRECTORY DESTINATION ${CIFPP_CACHE_DIR})
 	install(DIRECTORY DESTINATION "${CIFPP_ETC_DIR}/libcifpp/cache-update.d")
 	install(DIRECTORY DESTINATION "${CIFPP_ETC_DIR}/libcifpp/cache-update.d")
 
 
-	# a config to, to make it complete
+	# a config file, to make it complete
 	if(NOT EXISTS "${CIFPP_ETC_DIR}/libcifpp.conf")
 	if(NOT EXISTS "${CIFPP_ETC_DIR}/libcifpp.conf")
 		file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libcifpp.conf [[# Uncomment the next line to enable automatic updates
 		file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libcifpp.conf [[# Uncomment the next line to enable automatic updates
 # update=true
 # update=true

cmake/FindAtomic.cmake

@@ -56,6 +56,7 @@ endif()
 cmake_pop_check_state()
 cmake_pop_check_state()
 
 
 set(Atomic_FOUND ${_found} CACHE BOOL "TRUE if we can run a program using std::atomic" FORCE)
 set(Atomic_FOUND ${_found} CACHE BOOL "TRUE if we can run a program using std::atomic" FORCE)
+mark_as_advanced(Atomic_FOUND)
 
 
 if(Atomic_FIND_REQUIRED AND NOT Atomic_FOUND)
 if(Atomic_FIND_REQUIRED AND NOT Atomic_FOUND)
     message(FATAL_ERROR "Cannot run simple program using std::atomic")
     message(FATAL_ERROR "Cannot run simple program using std::atomic")

cmake/FindFilesystem.cmake

@@ -67,6 +67,7 @@ endif()
 cmake_pop_check_state()
 cmake_pop_check_state()
 
 
 set(Filesystem_FOUND ${_found} CACHE BOOL "TRUE if we can run a program using std::filesystem" FORCE)
 set(Filesystem_FOUND ${_found} CACHE BOOL "TRUE if we can run a program using std::filesystem" FORCE)
+mark_as_advanced(Filesystem_FOUND)
 
 
 if(Filesystem_FIND_REQUIRED AND NOT Filesystem_FOUND)
 if(Filesystem_FIND_REQUIRED AND NOT Filesystem_FOUND)
     message(FATAL_ERROR "Cannot run simple program using std::filesystem")
     message(FATAL_ERROR "Cannot run simple program using std::filesystem")