From 555200e72e2a43416865c89d6c5d31635e689e46 Mon Sep 17 00:00:00 2001 From: BenPinet Date: Tue, 16 Jul 2024 13:41:59 +0200 Subject: [PATCH 1/2] fix(V15): v15 changes BREAKING CHANGE: v15 changes --- .vscode/settings.json | 2 +- CMakeLists.txt | 4 ++-- cmake/Doxyfile.in | 2 +- include/mylib/{common.h => common.hpp} | 6 +++--- include/mylib/{hello_world.h => hello_world.hpp} | 2 +- src/mylib/common.cpp | 4 ++-- src/mylib/hello_world.cpp | 4 ++-- tests/mylib/test-hello-world.cpp | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) rename include/mylib/{common.h => common.hpp} (62%) rename include/mylib/{hello_world.h => hello_world.hpp} (97%) diff --git a/.vscode/settings.json b/.vscode/settings.json index f0f3850..051f1c9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,5 @@ { - "C_Cpp.default.cppStandard": "c++11", + "C_Cpp.default.cppStandard": "c++17", "C_Cpp.default.includePath": [ "${workspaceFolder}/include", "${workspaceFolder}/build", diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bdf220..d5b4ed3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,8 +40,8 @@ add_geode_library( "common.cpp" "hello_world.cpp" PUBLIC_HEADERS - "common.h" - "hello_world.h" + "common.hpp" + "hello_world.hpp" PRIVATE_DEPENDENCIES OpenGeode::basic ) diff --git a/cmake/Doxyfile.in b/cmake/Doxyfile.in index 4a60b82..a4e8c4e 100644 --- a/cmake/Doxyfile.in +++ b/cmake/Doxyfile.in @@ -108,7 +108,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- INPUT = @CMAKE_SOURCE_DIR@/include @CMAKE_SOURCE_DIR@/docs INPUT_ENCODING = UTF-8 -FILE_PATTERNS = *.h *.dox +FILE_PATTERNS = *.hpp *.dox RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO diff --git a/include/mylib/common.h b/include/mylib/common.hpp similarity index 62% rename from include/mylib/common.h rename to include/mylib/common.hpp index 12d2b3d..8d529d6 100644 --- a/include/mylib/common.h +++ b/include/mylib/common.hpp @@ -4,9 +4,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace mymodule { diff --git a/include/mylib/hello_world.h b/include/mylib/hello_world.hpp similarity index 97% rename from include/mylib/hello_world.h rename to include/mylib/hello_world.hpp index 83e6b1d..c7a9607 100644 --- a/include/mylib/hello_world.h +++ b/include/mylib/hello_world.hpp @@ -23,7 +23,7 @@ #pragma once -#include +#include namespace mymodule { diff --git a/src/mylib/common.cpp b/src/mylib/common.cpp index 4bd225e..d1ee6e1 100644 --- a/src/mylib/common.cpp +++ b/src/mylib/common.cpp @@ -21,9 +21,9 @@ * */ -#include +#include -#include +#include namespace mymodule { diff --git a/src/mylib/hello_world.cpp b/src/mylib/hello_world.cpp index 0fca118..a00c6d3 100644 --- a/src/mylib/hello_world.cpp +++ b/src/mylib/hello_world.cpp @@ -21,9 +21,9 @@ * */ -#include +#include -#include +#include namespace mymodule { diff --git a/tests/mylib/test-hello-world.cpp b/tests/mylib/test-hello-world.cpp index 1f65b25..82e02ea 100644 --- a/tests/mylib/test-hello-world.cpp +++ b/tests/mylib/test-hello-world.cpp @@ -21,10 +21,10 @@ * */ -#include -#include +#include +#include -#include +#include int main() { From c50d4a018619c1c53d7e7381d84542ed07be89d6 Mon Sep 17 00:00:00 2001 From: BenPinet Date: Tue, 16 Jul 2024 11:43:02 +0000 Subject: [PATCH 2/2] Apply prepare changes --- bindings/python/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/requirements.txt b/bindings/python/requirements.txt index 84af2d5..186c172 100644 --- a/bindings/python/requirements.txt +++ b/bindings/python/requirements.txt @@ -4,5 +4,5 @@ # # pip-compile --pre bindings/python/requirements.in # -opengeode-core==14.*,>=14.23.1 +opengeode-core==14.*,>=14.25.2rc2 # via -r bindings/python/requirements.in