QPR-11763 add quantlib PRs 1644, 1654 and 1656 to v1.30

Author: rolandlichters

cmake/GenerateHeaders.cmake

@@ -47,9 +47,13 @@ function(generate_dir_headers source_dir binary_dir)
     list(FILTER children_hpp EXCLUDE REGEX "swaptionvolcube1.hpp")
     list(FILTER children_hpp EXCLUDE REGEX "swaptionvolcube2.hpp")
     list(FILTER children_hpp EXCLUDE REGEX "swaptionvolcube1a.hpp")
-    list(FILTER children_hpp EXCLUDE REGEX "amortizingfixedratebond.hpp")
-    list(FILTER children_hpp EXCLUDE REGEX "amortizingfloatingratebond.hpp")
-    list(FILTER children_hpp EXCLUDE REGEX "amortizingcmsratebond.hpp")
+    # The ql/experimental/amortizingbonds have been moved to ql/instruments/bonds
+    # Therefore, we can ignore them as they only contain a warning and the new includes.
+    if (${source_dir} MATCHES "experimental" AND ${source_dir} MATCHES "amortizingbonds")
+        list(FILTER children_hpp EXCLUDE REGEX "amortizingfixedratebond.hpp")
+        list(FILTER children_hpp EXCLUDE REGEX "amortizingfloatingratebond.hpp")
+        list(FILTER children_hpp EXCLUDE REGEX "amortizingcmsratebond.hpp")
+    endif ()
     list(FILTER children_hpp EXCLUDE REGEX "riskybond.hpp")
     file(GLOB children_dir RELATIVE ${source_dir} "${source_dir}/*")
     list(FILTER children_dir EXCLUDE REGEX "CMakeFiles")
@@ -64,15 +68,13 @@ function(generate_dir_headers source_dir binary_dir)
             generate_dir_headers("${source_dir}/${child}" "${binary_dir}/${child}")
         endif()
     endforeach()
-    if (children_all)
-        file(WRITE "${binary_dir}/all.hpp"
-            "/* This file is automatically generated; do not edit. */\n\n")
-        foreach(child ${children_all})
-            file(RELATIVE_PATH all_path ${SOURCE_DIR} ${child})
-            file(APPEND "${binary_dir}/all.hpp" "#include <${all_path}>\n")
-        endforeach()
-    endif()
-endfunction()
+    file(WRITE "${binary_dir}/all.hpp"
+        "/* This file is automatically generated; do not edit. */\n\n")
+    foreach(child ${children_all})
+        file(RELATIVE_PATH all_path ${SOURCE_DIR} ${child})
+        file(APPEND "${binary_dir}/all.hpp" "#include <${all_path}>\n")
+    endforeach()
+    endfunction()
 
 # Call generate_dir_headers for each directory at this top level (ql/)
 function(generate_all_headers source_dir binary_dir)