for 18.04

CMakeLists.txt

@@ -185,6 +185,7 @@ find_package(Boost 1.70.0 REQUIRED COMPONENTS system iostreams regex program_opt
 
 
 if(NOT MSVC AND Boost_USE_STATIC_LIBS)
 if(NOT MSVC AND Boost_USE_STATIC_LIBS)
 	find_package(ZLIB REQUIRED)
 	find_package(ZLIB REQUIRED)
+	find_package(BZip2 REQUIRED)
 endif()
 endif()
 
 
 # Create a revision file, containing the current git version info
 # Create a revision file, containing the current git version info
@@ -212,7 +213,7 @@ if(RECREATE_SYMOP_DATA)
 
 
 	add_executable(symop-map-generator "${CMAKE_SOURCE_DIR}/tools/symop-map-generator.cpp")
 	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_LIBRARIES})
+	target_link_libraries(symop-map-generator Threads::Threads ${Boost_LIBRARIES} std::filesystem ${ZLIB_LIBRARIES} ${BZip2_LIBRARY})
 	if(Boost_INCLUDE_DIR)
 	if(Boost_INCLUDE_DIR)
 		target_include_directories(symop-map-generator PUBLIC ${Boost_INCLUDE_DIR})
 		target_include_directories(symop-map-generator PUBLIC ${Boost_INCLUDE_DIR})
 	endif()
 	endif()
@@ -277,7 +278,6 @@ target_include_directories(cifpp
 	"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
 	"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
 	"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
 	"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
 	${Boost_INCLUDE_DIR}
 	${Boost_INCLUDE_DIR}
-	${ZLIB_INCLUDE_DIR}
 )
 )
 
 
 target_include_directories(cifpp
 target_include_directories(cifpp
@@ -285,7 +285,7 @@ target_include_directories(cifpp
 	${CMAKE_BINARY_DIR}
 	${CMAKE_BINARY_DIR}
 )
 )
 
 
-target_link_libraries(cifpp Threads::Threads ${Boost_LIBRARIES} std::filesystem ${ZLIB_LIBRARIES})
+target_link_libraries(cifpp Threads::Threads ${Boost_LIBRARIES} std::filesystem ${ZLIB_LIBRARIES} ${BZip2_LIBRARY})
 
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
 if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     target_link_options(cifpp PRIVATE -undefined dynamic_lookup)
     target_link_options(cifpp PRIVATE -undefined dynamic_lookup)
@@ -449,7 +449,7 @@ if(CIFPP_BUILD_TESTS)
 			${CMAKE_CURRENT_BINARY_DIR}  # for config.h
 			${CMAKE_CURRENT_BINARY_DIR}  # for config.h
 		)
 		)
 
 
-		target_link_libraries(${CIFPP_TEST} PRIVATE Threads::Threads cifpp ${Boost_LIBRARIES} std::filesystem ${ZLIB_LIBRARIES})
+		target_link_libraries(${CIFPP_TEST} PRIVATE Threads::Threads cifpp ${Boost_LIBRARIES} std::filesystem ${ZLIB_LIBRARIES} ${BZip2_LIBRARY})
 	
 	
 		if(MSVC)
 		if(MSVC)
 			# Specify unwind semantics so that MSVC knowns how to handle exceptions
 			# Specify unwind semantics so that MSVC knowns how to handle exceptions

Config.cmake.in

@@ -2,6 +2,8 @@
 
 
 include(CMakeFindDependencyMacro)
 include(CMakeFindDependencyMacro)
 find_dependency(Boost 1.70.0 REQUIRED COMPONENTS system iostreams regex program_options)
 find_dependency(Boost 1.70.0 REQUIRED COMPONENTS system iostreams regex program_options)
+find_dependency(ZLIB)
+find_dependency(BZip2)
 
 
 INCLUDE("${CMAKE_CURRENT_LIST_DIR}/cifppTargets.cmake")
 INCLUDE("${CMAKE_CURRENT_LIST_DIR}/cifppTargets.cmake")
 
 

src/Cif2PDB.cpp

@@ -28,6 +28,7 @@
 #include <set>
 #include <set>
 #include <regex>
 #include <regex>
 #include <cmath>
 #include <cmath>
+#include <iomanip>
 
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
 #include <boost/format.hpp>