From 08d33a313afb324692ba15c0e0ccc5108b6a5b0e Mon Sep 17 00:00:00 2001 From: "Hans J. Johnson" Date: Fri, 19 Dec 2025 17:17:55 -0600 Subject: [PATCH 1/2] WIP: DO NOT COMMIT. Test against outstanding PR. --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27a813c..a63dc45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,9 +138,11 @@ 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 c3ad4806b259b4cd734e3ea101551aa7dc8e5688 CACHE STRING "CastXML Git revision.") ExternalProject_Add(castxml - GIT_REPOSITORY https://github.com/CastXML/CastXML.git + #GIT_REPOSITORY https://github.com/CastXML/CastXML.git + # WIP DO NOT COMMIT UNITL AFTER https://github.com/CastXML/CastXML/pull/295 is incorporated. + GIT_REPOSITORY https://github.com/hjmjohnson/CastXML.git GIT_TAG ${CastXML_GIT_TAG} DEPENDS ${castxml_deps} CMAKE_ARGS -Wno-dev From 84dd6a40ccaec35f089f20fc2081d95877ca7bf8 Mon Sep 17 00:00:00 2001 From: "Hans J. Johnson" Date: Fri, 19 Dec 2025 21:19:35 -0600 Subject: [PATCH 2/2] test: exclude fbracket-depth that is incompatible with github CI --- .github/workflows/ci.yml | 7 ++++++- CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) 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 diff --git a/CMakeLists.txt b/CMakeLists.txt index a63dc45..bea8ea8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,7 +138,7 @@ 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 c3ad4806b259b4cd734e3ea101551aa7dc8e5688 CACHE STRING "CastXML Git revision.") +set(CastXML_GIT_TAG "216-Followup-MSVC-fix" CACHE STRING "CastXML Git revision." FORCE) ExternalProject_Add(castxml #GIT_REPOSITORY https://github.com/CastXML/CastXML.git # WIP DO NOT COMMIT UNITL AFTER https://github.com/CastXML/CastXML/pull/295 is incorporated.