QPR-11322 Implement zlib support for Python wrappers/wheels

Author: Eric Ehlers

OREAnalytics/CMakeLists.txt

@@ -16,16 +16,14 @@ if(MSVC)
 	add_compile_definitions(BOOST_IOSTREAMS_NO_LIB)
 endif()
 
-if(ORE_USE_ZLIB)
-    find_package(ZLIB REQUIRED)
-endif()
-
+SET(COMPONENT_LIST date_time filesystem iostreams regex serialization system timer thread)
 if (ORE_BUILD_TESTS)
-    SET(COMPONENTS_CONDITIONAL "unit_test_framework")
-else()
-    SET(COMPONENTS_CONDITIONAL "")
+    LIST(APPEND COMPONENT_LIST unit_test_framework)
+endif()
+if(ORE_USE_ZLIB)
+    LIST(APPEND COMPONENT_LIST zlib)
 endif()
-find_package (Boost REQUIRED COMPONENTS ${COMPONENTS_CONDITIONAL} regex date_time thread serialization system filesystem timer iostreams OPTIONAL_COMPONENTS chrono)
+find_package (Boost REQUIRED COMPONENTS ${COMPONENT_LIST} OPTIONAL_COMPONENTS chrono)
 if (ORE_ENABLE_PARALLEL_UNIT_TEST_RUNNER AND UNIX AND NOT APPLE)
     find_library(RT_LIBRARY rt REQUIRED)
 endif()

OREAnalytics/orea/CMakeLists.txt

@@ -176,7 +176,6 @@ target_link_libraries(${OREA_LIB_NAME} ${QLE_LIB_NAME})
 target_link_libraries(${OREA_LIB_NAME} ${ORED_LIB_NAME})
 target_link_libraries(${OREA_LIB_NAME} ${Boost_LIBRARIES})
 if(ZLIB_FOUND)
-    target_link_libraries(${OREA_LIB_NAME} ZLIB::ZLIB)
     add_definitions(-DORE_USE_ZLIB)
 endif()