Skip to content

fix(V15): v15 changes #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(V15): v15 changes #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
555200e
fix(V15): v15 changes
BenPinet Jul 16, 2024
c50d4a0
Apply prepare changes
BenPinet Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"C_Cpp.default.cppStandard": "c++11",
"C_Cpp.default.cppStandard": "c++17",
"C_Cpp.default.includePath": [
"${workspaceFolder}/include",
"${workspaceFolder}/build",
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cmake/Doxyfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions include/mylib/common.h → include/mylib/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

#pragma once

#include <geode/basic/common.h>
#include <geode/basic/library.h>
#include <mylib/opengeode_mymodule_mylib_export.h>
#include <geode/basic/common.hpp>
#include <geode/basic/library.hpp>
#include <mylib/opengeode_mymodule_mylib_export.hpp>

namespace mymodule
{
Expand Down
2 changes: 1 addition & 1 deletion include/mylib/hello_world.h → include/mylib/hello_world.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#pragma once

#include <mylib/common.h>
#include <mylib/common.hpp>

namespace mymodule
{
Expand Down
4 changes: 2 additions & 2 deletions src/mylib/common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
*
*/

#include <mylib/common.h>
#include <mylib/common.hpp>

#include <geode/basic/library.h>
#include <geode/basic/library.hpp>

namespace mymodule
{
Expand Down
4 changes: 2 additions & 2 deletions src/mylib/hello_world.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
*
*/

#include <mylib/hello_world.h>
#include <mylib/hello_world.hpp>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: 'mylib/hello_world.hpp' file not found [clang-diagnostic-error]

#include <mylib/hello_world.hpp>
         ^


#include <geode/basic/logger.h>
#include <geode/basic/logger.hpp>

namespace mymodule
{
Expand Down
6 changes: 3 additions & 3 deletions tests/mylib/test-hello-world.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
*
*/

#include <geode/basic/assert.h>
#include <geode/basic/logger.h>
#include <geode/basic/assert.hpp>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: 'geode/basic/assert.hpp' file not found [clang-diagnostic-error]

#include <geode/basic/assert.hpp>
         ^

#include <geode/basic/logger.hpp>

#include <mylib/hello_world.h>
#include <mylib/hello_world.hpp>

int main()
{
Expand Down
Loading