git subrepo pull (merge) ore

subrepo:
  subdir:   "ore"
  merged:   "b40f563b7c"
upstream:
  origin:   "git@gitlab.acadiasoft.net:qs/ore.git"
  branch:   "master"
  commit:   "10540a62f7"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

Author: jenkins

App/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
 
 project(App CXX)
 
-include("../cmake/commonSettings.cmake")
+include(commonSettings)
 
 get_library_name("OREPlusBase" OREPBASE_LIB_NAME)
 get_library_name("OREAnalytics" OREA_LIB_NAME)

CMakeLists.txt

@@ -14,7 +14,11 @@ option(ORE_USE_ZLIB "Use compression for boost::iostreams" OFF)
 
 include(CTest)
 
-include("cmake/commonSettings.cmake")
+# Path for local cmake modules
+if(NOT "${CMAKE_CURRENT_LIST_DIR}/cmake" IN_LIST CMAKE_MODULE_PATH)
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+endif()
+include(commonSettings)
 
 set(USE_GLOBAL_ORE_BUILD ON)
 

Docker/CMakeLists_ORE.txt

@@ -10,7 +10,11 @@ option(ORE_USE_ZLIB "Use compression for boost::iostreams" ON)
 
 include(CTest)
 
-include("cmake/commonSettings.cmake")
+# Path for local cmake modules
+if(NOT "${CMAKE_CURRENT_LIST_DIR}/cmake" IN_LIST CMAKE_MODULE_PATH)
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+endif()
+include(commonSettings)
 
 add_link_directory_if_exists("${QUANTLIB_SOURCE_DIR}/build/ql")
 

OREAnalytics/CMakeLists.txt

@@ -4,8 +4,8 @@ project(OREAnalytics CXX)
 
 enable_testing()
 
-include("../cmake/writeAll.cmake")
-include("../cmake/commonSettings.cmake")
+include(writeAll)
+include(commonSettings)
 
 get_library_name("OREAnalytics" OREA_LIB_NAME)
 get_library_name("OREData" ORED_LIB_NAME)

OREData/CMakeLists.txt

@@ -4,8 +4,8 @@ project(OREData CXX)
 
 enable_testing()
 
-include("../cmake/writeAll.cmake")
-include("../cmake/commonSettings.cmake")
+include(writeAll)
+include(commonSettings)
 
 get_library_name("OREData" ORED_LIB_NAME)
 get_library_name("QuantExt" QLE_LIB_NAME)

QuantExt/CMakeLists.txt

@@ -4,9 +4,9 @@ project(QuantExt CXX)
 
 enable_testing()
 
-include("../cmake/writeAll.cmake")
-include("../cmake/writeTestSuiteMain.cmake")
-include("../cmake/commonSettings.cmake")
+include(writeAll)
+include(writeTestSuiteMain)
+include(commonSettings)
 
 get_library_name("QuantExt" QLE_LIB_NAME)
 set_ql_library_name()