QPR-13660: optional_components instead of conditional

Author: farahkhashman

ORE-SWIG/CMakeLists.txt

@@ -32,19 +32,16 @@ get_library_name("QuantExt" QLE_LIB_NAME)
 set_ql_library_name()
 
 # To build the module, we moreover need Boost, Swig, Python
-if(${Boost_VERSION_MINOR} LESS 89)
-    set(BOOST_COMPONENT_LIST serialization date_time filesystem system timer thread log)
-else()
-    set(BOOST_COMPONENT_LIST serialization date_time filesystem timer thread log)
-endif()
+set(BOOST_COMPONENT_LIST serialization date_time filesystem timer thread log)
+
 
 if(ORE_USE_ZLIB)
     list(APPEND BOOST_COMPONENT_LIST iostreams)
     if(MSVC)
         list(APPEND BOOST_COMPONENT_LIST zlib)
     endif()
 endif()
-find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENT_LIST})
+find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENT_LIST} OPTIONAL_COMPONENTS system)
 find_package(SWIG REQUIRED)
 find_package(Python REQUIRED COMPONENTS Development)
 if(ORE_USE_ZLIB)

ORE-SWIG/OREAnalytics-SWIG/Java/CMakeLists.txt

@@ -51,11 +51,7 @@ include_directories(${PROJECT_SOURCE_DIR}/../../QuantExt-SWIG/SWIG)
 include_directories(${PROJECT_SOURCE_DIR}/../../OREData-SWIG/SWIG)
 include_directories(${PROJECT_SOURCE_DIR}/../../OREAnalytics-SWIG/SWIG)
 
-if(${Boost_VERSION_MINOR} LESS 89)
-    find_package (Boost COMPONENTS serialization date_time system filesystem REQUIRED)
-else()
-    find_package (Boost COMPONENTS serialization date_time filesystem REQUIRED)
-endif()
+find_package (Boost REQUIRED COMPONENTS serialization date_time filesystem OPTIONAL_COMPONENTS system)
 include_directories(${Boost_INCLUDE_DIRS})
 
 # specify library search path (update this when we build ORE with cmake)

ORE-SWIG/OREData-SWIG/Java/CmakeLists.txt

@@ -48,11 +48,8 @@ include_directories(${PROJECT_SOURCE_DIR}/../../QuantLib-SWIG/SWIG)
 include_directories(${PROJECT_SOURCE_DIR}/../../QuantExt-SWIG/SWIG)
 include_directories(${PROJECT_SOURCE_DIR}/../../OREData-SWIG/SWIG)
 
-if(${Boost_VERSION_MINOR} LESS 89)
-    find_package (Boost COMPONENTS serialization date_time regex filesystem system REQUIRED)
-else()
-    find_package (Boost COMPONENTS serialization date_time regex filesystem REQUIRED)
-endif()
+find_package (Boost REQUIRED COMPONENTS serialization date_time regex filesystem OPTIONAL_COMPONENTS system)
+
 include_directories(${Boost_INCLUDE_DIRS})
 
 # specify library search path (update this when we build ORE with cmake)

OREAnalytics/CMakeLists.txt

@@ -17,19 +17,15 @@ if(ORE_USE_ZLIB)
     find_package(ZLIB REQUIRED)
 endif()
 
-if(${Boost_VERSION_MINOR} LESS 89)
-    SET(COMPONENT_LIST date_time filesystem iostreams serialization system timer thread)
-else()
-    SET(COMPONENT_LIST date_time filesystem iostreams serialization timer thread)
-endif()
+SET(COMPONENT_LIST date_time filesystem iostreams serialization timer thread)
 
 if (ORE_BUILD_TESTS)
     LIST(APPEND COMPONENT_LIST unit_test_framework)
 endif()
 if(MSVC AND ORE_USE_ZLIB)
     LIST(APPEND COMPONENT_LIST zlib)
 endif()
-find_package (Boost REQUIRED COMPONENTS ${COMPONENT_LIST} OPTIONAL_COMPONENTS chrono)
+find_package (Boost REQUIRED COMPONENTS ${COMPONENT_LIST} OPTIONAL_COMPONENTS system chrono)
 if (ORE_ENABLE_PARALLEL_UNIT_TEST_RUNNER AND UNIX AND NOT APPLE)
     find_library(RT_LIBRARY rt REQUIRED)
 endif()

QuantExt/CMakeLists.txt

@@ -13,11 +13,9 @@ else()
     SET(COMPONENTS_CONDITIONAL "")
 endif()
 
-if(${Boost_VERSION_MINOR} LESS 89)
-    find_package (Boost REQUIRED COMPONENTS ${COMPONENTS_CONDITIONAL} date_time thread serialization system timer log filesystem OPTIONAL_COMPONENTS chrono)
-else()
-    find_package (Boost REQUIRED COMPONENTS ${COMPONENTS_CONDITIONAL} date_time thread serialization timer log filesystem OPTIONAL_COMPONENTS chrono)
-endif()
+
+find_package (Boost REQUIRED COMPONENTS ${COMPONENTS_CONDITIONAL} date_time thread serialization timer log filesystem OPTIONAL_COMPONENTS system chrono)
+
 
 if (ORE_ENABLE_PARALLEL_UNIT_TEST_RUNNER AND UNIX AND NOT APPLE)
     find_library(RT_LIBRARY rt REQUIRED)