fix makefile

CMakeLists.txt

@@ -188,10 +188,6 @@ if(GXX_LIBSTDCPP)
 	endif()
 endif()
 
-set(CMAKE_THREAD_PREFER_PTHREAD)
-set(THREADS_PREFER_PTHREAD_FLAG)
-find_package(Threads)
-
 if(MSVC)
 	# Avoid linking the shared library of zlib Search ZLIB_ROOT first if it is
 	# set.
@@ -221,6 +217,7 @@ if(MSVC)
 endif()
 
 find_package(ZLIB QUIET)
+find_package(Threads)
 
 if(NOT ZLIB_FOUND)
 	message(FATAL_ERROR "The zlib development files were not found you this system, please install them and try again (hint: on debian/ubuntu use apt-get install zlib1g-dev)")
@@ -464,75 +461,69 @@ else()
 	unset(CIFPP_CACHE_DIR)
 endif()
 
-# Avoid full installation in case we are not the top level target
-if(PROJECT_IS_TOP_LEVEL OR BUILD_FOR_CCP4)
-	# Install rules
-	install(TARGETS cifpp
+# Install rules
+install(TARGETS cifpp
 	EXPORT cifpp
 	FILE_SET cifpp_headers DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
-	if(MSVC AND BUILD_SHARED_LIBS)
+if(MSVC AND BUILD_SHARED_LIBS)
 	install(
 		FILES $<TARGET_PDB_FILE:cifpp>
 		DESTINATION ${CMAKE_INSTALL_LIBDIR}
 		OPTIONAL)
-	endif()
+endif()
 
-	# Clean up old config files (with old names)
-	file(GLOB OLD_CONFIG_FILES
+# Clean up old config files (with old names)
+file(GLOB OLD_CONFIG_FILES
 	${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cifpp/cifppConfig*.cmake
 	${CMAKE_INSTALL_FULL_LIBDIR}/cmake/cifpp/cifppTargets*.cmake)
 
-	if(OLD_CONFIG_FILES)
+if(OLD_CONFIG_FILES)
 	message(
 		STATUS "Installation will remove old config files: ${OLD_CONFIG_FILES}")
 	install(CODE "file(REMOVE ${OLD_CONFIG_FILES})")
-	endif()
+endif()
 
-	install(EXPORT cifpp
+install(EXPORT cifpp
 	NAMESPACE cifpp::
 	FILE "cifpp-targets.cmake"
 	DESTINATION lib/cmake/cifpp)
 
-	if(CIFPP_DATA_DIR AND CIFPP_DOWNLOAD_CCD)
+if(CIFPP_DATA_DIR AND CIFPP_DOWNLOAD_CCD)
 	install(
 		FILES ${CMAKE_CURRENT_SOURCE_DIR}/rsrc/mmcif_ddl.dic
 		${CMAKE_CURRENT_SOURCE_DIR}/rsrc/mmcif_pdbx.dic
 		${CMAKE_CURRENT_SOURCE_DIR}/rsrc/mmcif_ma.dic ${COMPONENTS_CIF}
 		DESTINATION ${CMAKE_INSTALL_DATADIR}/libcifpp)
-	endif()
+endif()
 
-	set(CONFIG_TEMPLATE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cifpp-config.cmake.in)
+set(CONFIG_TEMPLATE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cifpp-config.cmake.in)
 
-	configure_package_config_file(
+configure_package_config_file(
 	${CONFIG_TEMPLATE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifpp-config.cmake
 	INSTALL_DESTINATION lib/cmake/cifpp
 	PATH_VARS CIFPP_DATA_DIR)
 
-	install(
+install(
 	FILES "${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifpp-config.cmake"
 	"${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifpp-config-version.cmake"
 	DESTINATION lib/cmake/cifpp)
 
-	set_target_properties(
+set_target_properties(
 	cifpp
 	PROPERTIES VERSION ${PROJECT_VERSION}
 	SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
 	INTERFACE_cifpp_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
 
-	set_property(
+set_property(
 	TARGET cifpp
 	APPEND
 	PROPERTY COMPATIBLE_INTERFACE_STRING cifpp_MAJOR_VERSION)
 
-	write_basic_package_version_file(
+write_basic_package_version_file(
 	"${CMAKE_CURRENT_BINARY_DIR}/cifpp/cifpp-config-version.cmake"
 	VERSION ${PROJECT_VERSION}
 	COMPATIBILITY AnyNewerVersion)
-else()
-	# Set this variable so that consumers can find the files in rsrc
-	set(CIFPP_SHARE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rsrc PARENT_SCOPE)
-endif()
 
 if(BUILD_TESTING)
 	add_subdirectory(test)

test/CMakeLists.txt

 # We're using the older version 2 of Catch2
 
-find_package(Catch2 QUIET)
+if(NOT(Catch2_FOUND OR TARGET Catch2))
+	find_package(Catch2 QUIET)
+
+	if(NOT Catch2_FOUND)
+		include(FetchContent)
 
-if(NOT Catch2_FOUND)
 		FetchContent_Declare(
 			Catch2
 			GIT_REPOSITORY https://github.com/catchorg/Catch2.git
@@ -11,6 +14,7 @@ if(NOT Catch2_FOUND)
 		FetchContent_MakeAvailable(Catch2)
 
 		set(Catch2_VERSION "2.13.9")
+	endif()
 endif()
 
 list(
@@ -49,8 +53,7 @@ foreach(CIFPP_TEST IN LISTS CIFPP_tests)
 		target_compile_definitions(${CIFPP_TEST} PUBLIC CATCH22=1)
 	endif()
 
-	target_link_libraries(${CIFPP_TEST} PRIVATE Threads::Threads cifpp::cifpp
-		Catch2::Catch2)
+	target_link_libraries(${CIFPP_TEST} PRIVATE cifpp::cifpp Catch2::Catch2)
 	target_include_directories(${CIFPP_TEST} PRIVATE "${EIGEN_INCLUDE_DIR}")
 
 	if(MSVC)