Merge branch 'develop' of github.com:PDB-REDO/libcifpp into develop

CMakeLists.txt

@@ -178,9 +178,7 @@ find_package(Threads)
 
 set(Boost_DETAILED_FAILURE_MSG ON)
 # set(Boost_USE_STATIC_LIBS ON)
-find_package(Boost 1.70.0 REQUIRED COMPONENTS system iostreams regex date_time program_options)
-
-find_package(ZLIB REQUIRED COMPONENTS zlibstatic)
+find_package(Boost 1.70.0 REQUIRED COMPONENTS system iostreams regex date_time program_options OPTIONAL_COMPONENTS zlib)
 
 # Create a revision file, containing the current git version info
 
@@ -207,7 +205,7 @@ if(RECREATE_SYMOP_DATA)
 
 	add_executable(symop-map-generator "${CMAKE_SOURCE_DIR}/tools/symop-map-generator.cpp")
 
-	target_link_libraries(symop-map-generator Threads::Threads ${Boost_LIBRARIES} std::filesystem ZLIB::ZLIB)
+	target_link_libraries(symop-map-generator Threads::Threads ${Boost_LIBRARIES} std::filesystem)
 	if(Boost_INCLUDE_DIR)
 		target_include_directories(symop-map-generator PUBLIC ${Boost_INCLUDE_DIR})
 	endif()
@@ -271,16 +269,14 @@ target_include_directories(cifpp
 	PUBLIC
 	"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
 	"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-	${Boost_INCLUDE_DIR}
-	${ZLIB_INCLUDE_DIR}
-)
+	${Boost_INCLUDE_DIR})
 
 target_include_directories(cifpp
 	PRIVATE
 	${CMAKE_BINARY_DIR}
 )
 
-target_link_libraries(cifpp Threads::Threads ${Boost_LIBRARIES} std::filesystem ZLIB::ZLIB)
+target_link_libraries(cifpp Threads::Threads ${Boost_LIBRARIES} std::filesystem)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     target_link_options(cifpp PRIVATE -undefined dynamic_lookup)
@@ -454,7 +450,7 @@ if(CIFPP_BUILD_TESTS)
 			${CMAKE_CURRENT_BINARY_DIR}  # for config.h
 		)
 
-		target_link_libraries(${CIFPP_TEST} PRIVATE Threads::Threads cifpp ${Boost_LIBRARIES} std::filesystem ZLIB::ZLIB)
+		target_link_libraries(${CIFPP_TEST} PRIVATE Threads::Threads cifpp ${Boost_LIBRARIES} std::filesystem)
 	
 		if(MSVC)
 			# Specify unwind semantics so that MSVC knowns how to handle exceptions