From 454b275a3f85a7d1e346d556f8b628bdcaa2446a Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 20 Apr 2026 20:44:15 +1200 Subject: [PATCH 1/2] New version. --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 26976cbc3..cec56f65d 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.20260417.0 +0.20260420.0 From 5a51275a7bfbdbbd2f56bd1b9e17ceb56373b7b8 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 20 Apr 2026 20:43:48 +1200 Subject: [PATCH 2/2] Remove wrapper headers and use SYSTEM includes --- cmake/common.cmake | 2 +- src/3rdparty/LLVMClang/clangbegin.h | 17 ----- src/3rdparty/LLVMClang/clangend.h | 17 ----- src/3rdparty/LLVMClang/llvmbegin.h | 77 ----------------------- src/3rdparty/LLVMClang/llvmend.h | 23 ------- src/3rdparty/SUNDIALS/sundialsbegin.h | 20 ------ src/3rdparty/SUNDIALS/sundialsend.h | 19 ------ src/3rdparty/libCOMBINE/libcombinebegin.h | 20 ------ src/3rdparty/libCOMBINE/libcombineend.h | 19 ------ src/3rdparty/libSEDML/libsedmlbegin.h | 20 ------ src/3rdparty/libSEDML/libsedmlend.h | 19 ------ src/misc/compiler.cpp | 5 -- src/misc/compiler_p.h | 2 - src/solver/solvercvode.cpp | 7 +-- src/solver/solvercvode_p.h | 2 - src/solver/solverkinsol.cpp | 7 +-- src/solver/solverodefixedstep.cpp | 2 - src/support/combine/combinearchive.cpp | 2 - src/support/sedml/sedmlfile.cpp | 2 - src/version.cpp | 16 +---- 20 files changed, 4 insertions(+), 294 deletions(-) delete mode 100644 src/3rdparty/LLVMClang/clangbegin.h delete mode 100644 src/3rdparty/LLVMClang/clangend.h delete mode 100644 src/3rdparty/LLVMClang/llvmbegin.h delete mode 100644 src/3rdparty/LLVMClang/llvmend.h delete mode 100644 src/3rdparty/SUNDIALS/sundialsbegin.h delete mode 100644 src/3rdparty/SUNDIALS/sundialsend.h delete mode 100644 src/3rdparty/libCOMBINE/libcombinebegin.h delete mode 100644 src/3rdparty/libCOMBINE/libcombineend.h delete mode 100644 src/3rdparty/libSEDML/libsedmlbegin.h delete mode 100644 src/3rdparty/libSEDML/libsedmlend.h diff --git a/cmake/common.cmake b/cmake/common.cmake index 9aac8e9fe..9f6613850 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -301,7 +301,7 @@ function(configure_target TARGET) NO_CMAKE_SYSTEM_PATH) endif() - target_include_directories(${TARGET} PRIVATE + target_include_directories(${TARGET} SYSTEM PRIVATE $ $) diff --git a/src/3rdparty/LLVMClang/clangbegin.h b/src/3rdparty/LLVMClang/clangbegin.h deleted file mode 100644 index 3e40b142c..000000000 --- a/src/3rdparty/LLVMClang/clangbegin.h +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright libOpenCOR contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include "llvmbegin.h" diff --git a/src/3rdparty/LLVMClang/clangend.h b/src/3rdparty/LLVMClang/clangend.h deleted file mode 100644 index 507be09a9..000000000 --- a/src/3rdparty/LLVMClang/clangend.h +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright libOpenCOR contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include "llvmend.h" diff --git a/src/3rdparty/LLVMClang/llvmbegin.h b/src/3rdparty/LLVMClang/llvmbegin.h deleted file mode 100644 index e9b52daf1..000000000 --- a/src/3rdparty/LLVMClang/llvmbegin.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -Copyright libOpenCOR contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#if defined(BUILDING_USING_MSVC) -# pragma warning(push) -# pragma warning(disable: 4100) -# pragma warning(disable: 4127) -# pragma warning(disable: 4146) -# pragma warning(disable: 4244) -# pragma warning(disable: 4245) -# pragma warning(disable: 4267) -# pragma warning(disable: 4291) -# pragma warning(disable: 4324) -# pragma warning(disable: 4389) -# pragma warning(disable: 4458) -# pragma warning(disable: 4459) -# pragma warning(disable: 4624) -# pragma warning(disable: 4996) -# pragma warning(disable: 5054) -#elif defined(BUILDING_USING_GNU) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" -# pragma GCC diagnostic ignored "-Wredundant-move" -# pragma GCC diagnostic ignored "-Wunused-parameter" -#else -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wbitfield-enum-conversion" -# pragma clang diagnostic ignored "-Wc++98-compat-pedantic" -# pragma clang diagnostic ignored "-Wcast-align" -# pragma clang diagnostic ignored "-Wcomma" -# pragma clang diagnostic ignored "-Wdeprecated" -# pragma clang diagnostic ignored "-Wdocumentation" -# pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync" -# pragma clang diagnostic ignored "-Wdocumentation-unknown-command" -# pragma clang diagnostic ignored "-Wduplicate-enum" -# pragma clang diagnostic ignored "-Wenum-enum-conversion" -# pragma clang diagnostic ignored "-Wexit-time-destructors" -# pragma clang diagnostic ignored "-Wextra-semi" -# pragma clang diagnostic ignored "-Wextra-semi-stmt" -# pragma clang diagnostic ignored "-Wimplicit-int-conversion" -# pragma clang diagnostic ignored "-Winconsistent-missing-destructor-override" -# pragma clang diagnostic ignored "-Wmissing-noreturn" -# pragma clang diagnostic ignored "-Wmissing-variable-declarations" -# pragma clang diagnostic ignored "-Wold-style-cast" -# pragma clang diagnostic ignored "-Wpadded" -# pragma clang diagnostic ignored "-Wreserved-id-macro" -# pragma clang diagnostic ignored "-Wreserved-identifier" -# pragma clang diagnostic ignored "-Wshadow" -# pragma clang diagnostic ignored "-Wshadow-field" -# pragma clang diagnostic ignored "-Wshadow-field-in-constructor" -# pragma clang diagnostic ignored "-Wshift-sign-overflow" -# pragma clang diagnostic ignored "-Wshorten-64-to-32" -# pragma clang diagnostic ignored "-Wsign-conversion" -# pragma clang diagnostic ignored "-Wsigned-enum-bitfield" -# pragma clang diagnostic ignored "-Wsuggest-destructor-override" -# pragma clang diagnostic ignored "-Wswitch-default" -# pragma clang diagnostic ignored "-Wswitch-enum" -# pragma clang diagnostic ignored "-Wtautological-type-limit-compare" -# pragma clang diagnostic ignored "-Wundefined-func-template" -# pragma clang diagnostic ignored "-Wundefined-reinterpret-cast" -# pragma clang diagnostic ignored "-Wunused-but-set-variable" -# pragma clang diagnostic ignored "-Wunused-parameter" -# pragma clang diagnostic ignored "-Wweak-vtables" -#endif diff --git a/src/3rdparty/LLVMClang/llvmend.h b/src/3rdparty/LLVMClang/llvmend.h deleted file mode 100644 index 40cdba291..000000000 --- a/src/3rdparty/LLVMClang/llvmend.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright libOpenCOR contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#if defined(BUILDING_USING_MSVC) -# pragma warning(pop) -#elif defined(BUILDING_USING_GNU) -# pragma GCC diagnostic pop -#else -# pragma clang diagnostic pop -#endif diff --git a/src/3rdparty/SUNDIALS/sundialsbegin.h b/src/3rdparty/SUNDIALS/sundialsbegin.h deleted file mode 100644 index acd079bec..000000000 --- a/src/3rdparty/SUNDIALS/sundialsbegin.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright libOpenCOR contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#ifdef BUILDING_USING_CLANG -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wreserved-id-macro" -#endif diff --git a/src/3rdparty/SUNDIALS/sundialsend.h b/src/3rdparty/SUNDIALS/sundialsend.h deleted file mode 100644 index a9f458811..000000000 --- a/src/3rdparty/SUNDIALS/sundialsend.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright libOpenCOR contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#ifdef BUILDING_USING_CLANG -# pragma clang diagnostic pop -#endif diff --git a/src/3rdparty/libCOMBINE/libcombinebegin.h b/src/3rdparty/libCOMBINE/libcombinebegin.h deleted file mode 100644 index 0e29c90b0..000000000 --- a/src/3rdparty/libCOMBINE/libcombinebegin.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright libOpenCOR contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#ifdef BUILDING_USING_CLANG -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wheader-hygiene" -#endif diff --git a/src/3rdparty/libCOMBINE/libcombineend.h b/src/3rdparty/libCOMBINE/libcombineend.h deleted file mode 100644 index a9f458811..000000000 --- a/src/3rdparty/libCOMBINE/libcombineend.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright libOpenCOR contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#ifdef BUILDING_USING_CLANG -# pragma clang diagnostic pop -#endif diff --git a/src/3rdparty/libSEDML/libsedmlbegin.h b/src/3rdparty/libSEDML/libsedmlbegin.h deleted file mode 100644 index 0e29c90b0..000000000 --- a/src/3rdparty/libSEDML/libsedmlbegin.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright libOpenCOR contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#ifdef BUILDING_USING_CLANG -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wheader-hygiene" -#endif diff --git a/src/3rdparty/libSEDML/libsedmlend.h b/src/3rdparty/libSEDML/libsedmlend.h deleted file mode 100644 index a9f458811..000000000 --- a/src/3rdparty/libSEDML/libsedmlend.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright libOpenCOR contributors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#ifdef BUILDING_USING_CLANG -# pragma clang diagnostic pop -#endif diff --git a/src/misc/compiler.cpp b/src/misc/compiler.cpp index 503ecd6b4..36e54729c 100644 --- a/src/misc/compiler.cpp +++ b/src/misc/compiler.cpp @@ -16,7 +16,6 @@ limitations under the License. #include "compiler_p.h" -#include "clangbegin.h" #include "clang/Basic/TargetInfo.h" #include "clang/CodeGen/CodeGenAction.h" #include "clang/Driver/Compilation.h" @@ -25,9 +24,6 @@ limitations under the License. #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/TextDiagnosticPrinter.h" #include "clang/Lex/PreprocessorOptions.h" -#include "clangend.h" - -#include "llvmbegin.h" #include "llvm/IR/LegacyPassManager.h" #include "llvm/IR/Module.h" #include "llvm/MC/TargetRegistry.h" @@ -35,7 +31,6 @@ limitations under the License. #include "llvm/Support/TargetSelect.h" #include "llvm/Target/TargetMachine.h" #include "llvm-c/Core.h" -#include "llvmend.h" #include #include diff --git a/src/misc/compiler_p.h b/src/misc/compiler_p.h index 4476c5c48..90556c0aa 100644 --- a/src/misc/compiler_p.h +++ b/src/misc/compiler_p.h @@ -21,9 +21,7 @@ limitations under the License. #include "compiler.h" #ifndef __EMSCRIPTEN__ -# include "llvmbegin.h" # include "llvm/ExecutionEngine/Orc/LLJIT.h" -# include "llvmend.h" #endif namespace libOpenCOR { diff --git a/src/solver/solvercvode.cpp b/src/solver/solvercvode.cpp index 13ff9eb2f..b43def11f 100644 --- a/src/solver/solvercvode.cpp +++ b/src/solver/solvercvode.cpp @@ -16,22 +16,17 @@ limitations under the License. #include "solvercvode_p.h" -#include "libsedmlbegin.h" -#include "sedml/SedAlgorithm.h" -#include "libsedmlend.h" - -#include "sundialsbegin.h" #include "cvodes/cvodes.h" #include "cvodes/cvodes_bandpre.h" #include "cvodes/cvodes_diag.h" #include "nvector/nvector_serial.h" +#include "sedml/SedAlgorithm.h" #include "sunlinsol/sunlinsol_band.h" #include "sunlinsol/sunlinsol_dense.h" #include "sunlinsol/sunlinsol_spbcgs.h" #include "sunlinsol/sunlinsol_spgmr.h" #include "sunlinsol/sunlinsol_sptfqmr.h" #include "sunnonlinsol/sunnonlinsol_fixedpoint.h" -#include "sundialsend.h" #include diff --git a/src/solver/solvercvode_p.h b/src/solver/solvercvode_p.h index b2bb755f6..0be84f3aa 100644 --- a/src/solver/solvercvode_p.h +++ b/src/solver/solvercvode_p.h @@ -20,10 +20,8 @@ limitations under the License. #include "libopencor/solvercvode.h" -#include "sundialsbegin.h" #include "sundials/sundials_linearsolver.h" #include "sundials/sundials_nonlinearsolver.h" -#include "sundialsend.h" namespace libOpenCOR { diff --git a/src/solver/solverkinsol.cpp b/src/solver/solverkinsol.cpp index e3f08a4d8..d9f5e663f 100644 --- a/src/solver/solverkinsol.cpp +++ b/src/solver/solverkinsol.cpp @@ -16,19 +16,14 @@ limitations under the License. #include "solverkinsol_p.h" -#include "libsedmlbegin.h" -#include "sedml/SedAlgorithm.h" -#include "libsedmlend.h" - -#include "sundialsbegin.h" #include "kinsol/kinsol.h" #include "nvector/nvector_serial.h" +#include "sedml/SedAlgorithm.h" #include "sunlinsol/sunlinsol_band.h" #include "sunlinsol/sunlinsol_dense.h" #include "sunlinsol/sunlinsol_spbcgs.h" #include "sunlinsol/sunlinsol_spgmr.h" #include "sunlinsol/sunlinsol_sptfqmr.h" -#include "sundialsend.h" #include diff --git a/src/solver/solverodefixedstep.cpp b/src/solver/solverodefixedstep.cpp index 309592b85..3fbb15414 100644 --- a/src/solver/solverodefixedstep.cpp +++ b/src/solver/solverodefixedstep.cpp @@ -16,9 +16,7 @@ limitations under the License. #include "solverodefixedstep_p.h" -#include "libsedmlbegin.h" #include "sedml/SedAlgorithm.h" -#include "libsedmlend.h" namespace libOpenCOR { diff --git a/src/support/combine/combinearchive.cpp b/src/support/combine/combinearchive.cpp index 3f33fbec9..b693bc58a 100644 --- a/src/support/combine/combinearchive.cpp +++ b/src/support/combine/combinearchive.cpp @@ -19,10 +19,8 @@ limitations under the License. #include "utils.h" -#include "libcombinebegin.h" #include "combine/combinearchive.h" #include "omex/CaContent.h" -#include "libcombineend.h" namespace libOpenCOR { diff --git a/src/support/sedml/sedmlfile.cpp b/src/support/sedml/sedmlfile.cpp index e83cfb279..738d44274 100644 --- a/src/support/sedml/sedmlfile.cpp +++ b/src/support/sedml/sedmlfile.cpp @@ -38,13 +38,11 @@ limitations under the License. #include "libopencor/solverkinsol.h" #include "libopencor/solversecondorderrungekutta.h" -#include "libsedmlbegin.h" #include "sedml/SedChangeAttribute.h" #include "sedml/SedDocument.h" #include "sedml/SedReader.h" #include "sedml/SedOneStep.h" #include "sedml/SedUniformTimeCourse.h" -#include "libsedmlend.h" #include diff --git a/src/version.cpp b/src/version.cpp index 3c4c0561f..cb352f32b 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -16,33 +16,19 @@ limitations under the License. #include "version.h" -#include "clangbegin.h" #include "clang/Basic/Version.h" -#include "clangend.h" #ifndef __EMSCRIPTEN__ # include "curl/curlver.h" #endif -#include "libcellml/version.h" - #include "libopencor/version.h" -#include "llvmbegin.h" +#include "libcellml/version.h" #include "llvm/Config/llvm-config.h" -#include "llvmend.h" - -#include "libcombinebegin.h" #include "omex/common/libcombine-version.h" -#include "libcombineend.h" - -#include "libsedmlbegin.h" #include "sedml/common/libsedml-version.h" -#include "libsedmlend.h" - -#include "sundialsbegin.h" #include "sundials/sundials_version.h" -#include "sundialsend.h" #include #include