Merge branch 'master' into 'v.1.8.14.0'

merge master changes for libboost systems fix

See merge request qs/ore!126

Author: farahkhashman

ORE-SWIG/CMakeLists.txt

@@ -33,13 +33,15 @@ set_ql_library_name()
 
 # To build the module, we moreover need Boost, Swig, Python
 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,7 +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)
 
-find_package (Boost COMPONENTS serialization date_time filesystem REQUIRED)
+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,7 +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)
 
-find_package (Boost COMPONENTS serialization date_time regex filesystem REQUIRED)
+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

@@ -18,13 +18,14 @@ if(ORE_USE_ZLIB)
 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()

OREData/CMakeLists.txt

@@ -13,7 +13,9 @@ if (ORE_BUILD_TESTS)
 else()
     SET(COMPONENTS_CONDITIONAL "")
 endif()
-find_package (Boost REQUIRED COMPONENTS ${COMPONENTS_CONDITIONAL} date_time serialization filesystem timer log OPTIONAL_COMPONENTS chrono)
+
+find_package (Boost REQUIRED COMPONENTS ${COMPONENTS_CONDITIONAL} date_time thread serialization timer log filesystem OPTIONAL_COMPONENTS system chrono)
+
 
 include_directories(${Boost_INCLUDE_DIRS})
 include_directories(${QUANTLIB_SOURCE_DIR})

QuantExt/CMakeLists.txt

@@ -12,7 +12,11 @@ if (ORE_BUILD_TESTS)
 else()
     SET(COMPONENTS_CONDITIONAL "")
 endif()
-find_package (Boost REQUIRED COMPONENTS ${COMPONENTS_CONDITIONAL} date_time thread serialization timer log filesystem OPTIONAL_COMPONENTS chrono)
+
+
+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)
 endif()