From fe49fbb4058a0fd412d3fd77f6790dfb7dae9cc6 Mon Sep 17 00:00:00 2001 From: "Hans J. Johnson" Date: Fri, 19 Dec 2025 17:17:55 -0600 Subject: [PATCH 1/4] ENH: Update CastXML to version on 2026-01-05 Support exclusion of large stack requirement tests on github CI environments. --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27a813c..af41f62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,8 +137,7 @@ endif() if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_NAME MATCHES "Linux") set(linux_args "-DCMAKE_CXX_FLAGS:STRING=-static-libstdc++") endif() -# 2025-12-11 master -set(CastXML_GIT_TAG bca6af13daf298f6d63bf2e4d4488c11c7e99b22 CACHE STRING "CastXML Git revision.") +set(CastXML_GIT_TAG "9864b1ee75ff08bda40dee12b8a339237fbac97d" CACHE STRING "CastXML Git revision." FORCE) ExternalProject_Add(castxml GIT_REPOSITORY https://github.com/CastXML/CastXML.git GIT_TAG ${CastXML_GIT_TAG} From 7c667d3266c9fe0106e181a37244be853ca21f88 Mon Sep 17 00:00:00 2001 From: "Hans J. Johnson" Date: Fri, 19 Dec 2025 21:19:35 -0600 Subject: [PATCH 2/4] test: exclude fbracket-depth that is incompatible with github CI --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6380619..99ee243 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,11 +78,16 @@ jobs: ##################################### # [Optional] Run Tests + # NOTE: -LE LargeStackRequired is used to skip + # running tests on GitHub CI environment that + # has limited stack allowed. + # The fbracket-depth passes outside of GitHub + # but fails inside Github CI ##################################### - name: Test run: | cd build/castxml-prefix/src/castxml-build - ctest --output-on-failure + ctest --output-on-failure -LE LargeStackRequired ##################################### # Package the resulting castxml binary From 331ab1f8a7942c430a17ff791ebd242d5327f81f Mon Sep 17 00:00:00 2001 From: "Hans J. Johnson" Date: Sat, 20 Dec 2025 11:52:56 -0600 Subject: [PATCH 3/4] ENH: Set minimum supported macOS deployment target directly in CMake configuration The value of 10.11 was hard-coded for the external project build, but was not exposed at the SuperBuild level. This change makes the setting of the OSX_DEPLOYMENT_TARGET more transparent. --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index af41f62..880315b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,9 @@ set(CMAKE_CXX_STANDARD "17") if(APPLE) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11 CACHE STRING "Set the minimum supported OSX target") set(osx_args - -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.11 + -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET} ) endif() From 0917d93c54532c9ec53197500f1de897ead8f0a4 Mon Sep 17 00:00:00 2001 From: "Hans J. Johnson" Date: Sat, 20 Dec 2025 11:56:02 -0600 Subject: [PATCH 4/4] ENH: Disable unnecessary compression support in LLVM build configuration CMake building of llvm autodetects zstd and zlib from homebrew and automatically links against them. A compiler warning is given: ``` ld: warning: building for macOS-11.0, but linking with dylib '/opt/homebrew/opt/zstd/lib/libzstd.1.dylib' which was built for newer version 15.0 ``` Additionally, this prevents castxml from running on many systems due to the dependence on homebrew being installed with the same or newer version as was present during compilation. --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 880315b..49d1166 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,6 +95,10 @@ else() -DLLVM_INCLUDE_DOCS:BOOL=OFF -DLLVM_ENABLE_OCAMLDOC:BOOL=OFF -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN:BOOL=ON + # Disable unneeded compression support in llvm + -DLLVM_USE_STATIC_ZSTD:BOOL=OFF + -DLLVM_ENABLE_ZLIB:BOOL=OFF + -DLLVM_ENABLE_ZSTD:BOOL=OFF ${osx_args} ${verbose_command} ${download_extract_timestamp_flag}