From 3e3f63f35d376aa1fb71d041e2dede8e037bc569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=A9harbe?= Date: Mon, 29 Dec 2025 15:25:22 +0100 Subject: [PATCH 1/2] Update to NPOG fix for typing information [#80193] NPOG handles again correctly base types created from deferred sets and enumerated sets (#79161). BAST type building methods are updated to handle the enriched type information. Note that NPOG does not yet produce the type table information using the RichTypeInfos proposed structure. --- extern/BAST | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/BAST b/extern/BAST index c1499c3..64b74b8 160000 --- a/extern/BAST +++ b/extern/BAST @@ -1 +1 @@ -Subproject commit c1499c3834cf1d9ea14925bdd9b47e85eddcd639 +Subproject commit 64b74b8632e85933fb7ed8aacd279487febca7d7 From ef9e5d0343acbad7ffb63d08ede617e3ce2e880e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=A9harbe?= Date: Wed, 4 Feb 2026 15:22:41 +0100 Subject: [PATCH 2/2] follow BAST updates [#80199][#80248][gitlab #3] - handle unused local variables - tinyxml2 removed from sources - support for traceability attributes for Pred - fix reading base types in POG files --- .gitmodules | 4 ++++ CMakeLists.txt | 14 +++++--------- extern/BAST | 2 +- extern/tinyxml2 | 1 + src/CMakeLists.txt | 5 +++-- test/tools/CMakeLists.txt | 9 ++++----- 6 files changed, 18 insertions(+), 17 deletions(-) create mode 160000 extern/tinyxml2 diff --git a/.gitmodules b/.gitmodules index 0704bff..1e42aa1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,7 @@ path = extern/BAST url = https://github.com/CLEARSY/BAST.git branch = main +[submodule "extern/tinyxml2"] + path = extern/tinyxml2 + url = https://github.com/leethomason/tinyxml2.git + diff --git a/CMakeLists.txt b/CMakeLists.txt index 05187af..35e6a87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,20 +27,16 @@ else() set(PROJECT_IS_TOP_LEVEL FALSE) endif() -foreach(submodule -"${PROJECT_SOURCE_DIR}/extern/BAST") -if(NOT EXISTS "${submodule}/CMakeLists.txt") - message(FATAL_ERROR "Submodule ${submodule} is missing: update submodules and try again.") - message(FATAL_ERROR "Command : git submodule update --init --recursive.") -endif() -endforeach(submodule) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeModules) +if(PROJECT_IS_TOP_LEVEL) + add_subdirectory(extern/tinyxml2) +endif(PROJECT_IS_TOP_LEVEL) + add_subdirectory(extern/BAST) add_subdirectory(src) if(PROJECT_IS_TOP_LEVEL) include(CTest) add_subdirectory(test) -endif() +endif(PROJECT_IS_TOP_LEVEL) diff --git a/extern/BAST b/extern/BAST index 64b74b8..20f0203 160000 --- a/extern/BAST +++ b/extern/BAST @@ -1 +1 @@ -Subproject commit 64b74b8632e85933fb7ed8aacd279487febca7d7 +Subproject commit 20f0203cf7fb8a002d6e7be79a2c68378eaafc3c diff --git a/extern/tinyxml2 b/extern/tinyxml2 new file mode 160000 index 0000000..1dee28e --- /dev/null +++ b/extern/tinyxml2 @@ -0,0 +1 @@ +Subproject commit 1dee28e51f9175a31955b9791c74c430fe13dc82 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 89d64f2..13fb3a3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,9 +2,10 @@ project(POGLIB) set(CMAKE_CXX_STANDARD 17) include_directories( - ${BASTLIB_SOURCE_DIR} + ${BASTLIB_SOURCE_DIR} + ${tinyxml2_SOURCE_DIR} ) - + set(POGLIB_HEADERS pog.h pogXmlWriter.h) set(POGLIB_SOURCES pog.cpp pogXmlWriter.cpp) diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt index cd2ce43..249d689 100644 --- a/test/tools/CMakeLists.txt +++ b/test/tools/CMakeLists.txt @@ -1,18 +1,17 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.10) project(loadpog_test) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${POGLIB_SOURCE_DIR} - ${BASTLIB_SOURCE_DIR} + ${BASTLIB_SOURCE_DIR} + ${tinyxml2_SOURCE_DIR} ) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - add_executable(loadpog loadpog.cpp) get_target_property(LOADPOG_OUTPUT_DIRECTORY loadpog RUNTIME_OUTPUT_DIRECTORY) -target_link_libraries(loadpog PRIVATE POGLIB BAST_LIB) +target_link_libraries(loadpog PRIVATE POGLIB BAST_LIB tinyxml2::tinyxml2) set(loadpog_EXE ${LOADPOG_OUTPUT_DIRECTORY}/loadpog${CMAKE_EXECUTABLE_SUFFIX} CACHE PATH "loadpog executable")