Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 12 additions & 14 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# DO NOT MODIFY DIRECTLY THIS FILE
# LOOK AT https://github.com/Geode-solutions/actions
AccessModifierOffset: -4
AlignAfterOpenBracket: DontAlign
AlignConsecutiveAssignments: false
Expand All @@ -21,25 +19,25 @@ AlwaysBreakTemplateDeclarations: true
BinPackArguments: true
BinPackParameters: false
BraceWrapping:
AfterClass: true
AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: true
BeforeCatch: true
BeforeElse: true
IndentBraces: false
AfterClass: true
AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: true
BeforeCatch: true
BeforeElse: true
IndentBraces: false
BreakBeforeBinaryOperators: NonAssignment
BreakBeforeBraces: Custom
BreakBeforeTernaryOperators: true
BreakConstructorInitializers: BeforeColon
BreakInheritanceList: BeforeColon
#BreakStringLiterals
ColumnLimit: 80
CommentPragmas: ''
CommentPragmas: ""
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
Expand Down
32 changes: 20 additions & 12 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,37 @@
Checks: >
*,
-altera*,
-boost*,
-fuchsia*,
-llvmlibc*,
-llvm-header-guard,
-llvm-prefer-static-over-anonymous-namespace,
-google-readability-todo,
-misc-no-recursion,
-misc-include-cleaner,
-misc-const-correctness,
-modernize-use-trailing-return-type,
-portability-avoid-pragma-once,
-readability-use-anyofallof,
-readability-redundant-access-specifiers,
-readability-convert-member-functions-to-static,
-cppcoreguidelines-avoid-const-or-ref-data-members
-cppcoreguidelines-avoid-const-or-ref-data-members,
-cppcoreguidelines-pro-bounds-constant-array-index

CheckOptions:
- key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
value: '1'
- key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
value: "1"
- key: readability-identifier-length.MinimumLoopCounterNameLength
value: 1
- key: readability-identifier-length.IgnoredVariableNames
value: '^[defijkptuvw]$'
value: "^[_defijkptuvwxyz]$"
# More options here: https://clang.llvm.org/extra/clang-tidy/checks/readability/identifier-naming.html
- key: readability-identifier-naming.NamespaceCase
value: lower_case
- key: readability-identifier-naming.ClassCase
value: CamelCase
value: CamelCase
- key: readability-identifier-naming.StructCase
value: CamelCase
value: CamelCase
- key: readability-identifier-naming.FunctionCase
value: lower_case
- key: readability-identifier-naming.VariableCase
Expand All @@ -51,14 +59,14 @@ CheckOptions:
- key: readability-identifier-naming.GlobalFunctionCase
value: lower_case
- key: readability-identifier-naming.MemberConstantCase
value: CamelCase
value: CamelCase
- key: readability-identifier-naming.StaticConstantCase
value: lower_case
value: lower_case
- key: readability-function-cognitive-complexity.Threshold
value: 10
- key: readability-function-cognitive-complexity.IgnoreMacros
value: true
- key: readability-function-size.ParameterThreshold
value: 4
- key: misc-include-cleaner.IgnoreHeaders
value: utility;cstddef;geode/.*_export\.h;geode/.*/common\.h;geode/basic/types\.h;geode/basic/assert\.h;


- key: cppcoreguidelines-pro-type-member-init.IgnoreArrays
value: true
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github: Geode-solutions
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ jobs:
deploy:
uses: Geode-solutions/actions/.github/workflows/cpp-deploy.yml@master
with:
name: OPENGEODE_MYMODULE
name: OPENGEODE_INSPECTOR_GEOSCIENCES
repos: ${{ vars.REPOS }}
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/manual_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ jobs:
release:
uses: Geode-solutions/actions/.github/workflows/trigger-release.yml@master
with:
branch: master
branch: next
secrets: inherit
9 changes: 9 additions & 0 deletions .github/workflows/merge_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Merge request

on:
workflow_dispatch:

jobs:
release:
uses: Geode-solutions/actions/.github/workflows/cpp-merge-request.yml@master
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/prepare_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Prepare deploy
on:
workflow_dispatch:

jobs:
jobs:
prepare:
uses: Geode-solutions/actions/.github/workflows/cpp-prepare-deploy.yml@master
secrets: inherit
21 changes: 21 additions & 0 deletions .github/workflows/schedule.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Schedule

on:
workflow_dispatch:
inputs:
branch:
type: string
default: "next"
schedule:
- cron: 0 23 * * *

jobs:
schedule:
uses: Geode-solutions/actions/.github/workflows/cpp-schedule.yml@master
with:
name: OPENGEODE_INSPECTOR_GEOSCIENCES
repos: ${{ vars.REPOS }}
branch: ${{ inputs.branch || 'next' }}
secrets:
TOKEN: ${{ secrets.TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ jobs:
test:
uses: Geode-solutions/actions/.github/workflows/cpp-test.yml@master
with:
name: OPENGEODE_MYMODULE
name: OPENGEODE_INSPECTOR_GEOSCIENCES
repos: ${{ vars.REPOS }}
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/test_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]

jobs:
jobs:
test:
uses: Geode-solutions/actions/.github/workflows/cpp-test-pr.yml@master
with:
name: OPENGEODE_MYMODULE
name: OPENGEODE_INSPECTOR_GEOSCIENCES
repos: ${{ vars.REPOS }}
secrets: inherit
40 changes: 37 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,43 @@
{
"C_Cpp.default.cppStandard": "c++11",
"C_Cpp.default.cppStandard": "c++17",
"C_Cpp.default.includePath": [
"${workspaceFolder}/include",
"${workspaceFolder}/build",
"${workspaceFolder:OpenGeode}/build/opengeode/install/include"
"${workspaceFolder}/build/include",
"${workspaceFolder:OpenGeode}/include",
"${workspaceFolder:OpenGeode}/build/opengeode/include",
"${workspaceFolder:OpenGeode}/build/third_party/abseil/install/include",
"${workspaceFolder:OpenGeode}/build/third_party/bitsery/install/include",
"${workspaceFolder:OpenGeode}/build/third_party/gdal/install/include",
"${workspaceFolder:OpenGeode}/build/third_party/pybind11/install/include",
"${workspaceFolder:OpenGeode}/build/third_party/asyncplusplus/install/include",
"${workspaceFolder:OpenGeode-IO}/include",
"${workspaceFolder:OpenGeode-IO}/build/opengeode-io/include",
"${workspaceFolder:OpenGeode-Geosciences}/include",
"${workspaceFolder:OpenGeode-Geosciences}/build/include",
"${workspaceFolder:OpenGeode-GeosciencesIO}/include",
"${workspaceFolder:OpenGeode-GeosciencesIO}/build/include",
"${workspaceFolder:OpenGeode-Inspector}/include",
"${workspaceFolder:OpenGeode-Inspector}/build/include"
],
"C_Cpp.default.browse.path": [
"${workspaceFolder}/include",
"${workspaceFolder}/src",
"${workspaceFolder}/build/include",
"${workspaceFolder:OpenGeode}/include",
"${workspaceFolder:OpenGeode}/build/opengeode/include",
"${workspaceFolder:OpenGeode}/build/third_party/abseil/install/include",
"${workspaceFolder:OpenGeode}/build/third_party/bitsery/install/include",
"${workspaceFolder:OpenGeode}/build/third_party/gdal/install/include",
"${workspaceFolder:OpenGeode}/build/third_party/pybind11/install/include",
"${workspaceFolder:OpenGeode}/build/third_party/asyncplusplus/install/include",
"${workspaceFolder:OpenGeode-IO}/include",
"${workspaceFolder:OpenGeode-IO}/build/opengeode-io/include",
"${workspaceFolder:OpenGeode-Geosciences}/include",
"${workspaceFolder:OpenGeode-Geosciences}/build/include",
"${workspaceFolder:OpenGeode-GeosciencesIO}/include",
"${workspaceFolder:OpenGeode-GeosciencesIO}/build/include",
"${workspaceFolder:OpenGeode-Inspector}/include",
"${workspaceFolder:OpenGeode-Inspector}/build/include"
],
"files.watcherExclude": {
"${workspaceFolder}/build/**": true
Expand Down
50 changes: 29 additions & 21 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,42 +21,50 @@
cmake_minimum_required(VERSION 3.15)

cmake_policy(SET CMP0091 NEW)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")

# Define the project
project(OpenGeode-MyModule CXX)
project(OpenGeode-Inspector_Geosciences CXX)

option(OPENGEODE_MYMODULE_WITH_TESTS "Compile test projects" ON)
option(OPENGEODE_MYMODULE_WITH_PYTHON "Compile Python bindings" OFF)
option(OPENGEODE_INSPECTOR_GEOSCIENCES_WITH_TESTS "Compile test projects" ON)
option(OPENGEODE_INSPECTOR_GEOSCIENCES_WITH_PYTHON "Compile Python bindings" OFF)
# option(OPENGEODE_INSPECTOR_GEOSCIENCES_WITH_EXECUTABLES "Compile executable projects" ON)

# Get MyModule dependencies
# Get dependencies
find_package(OpenGeode REQUIRED CONFIG)
find_package(Async++ REQUIRED)
find_package(OpenGeode-Geosciences REQUIRED CONFIG)
find_package(OpenGeode-Inspector REQUIRED CONFIG)

#------------------------------------------------------------------------------------------------
# Configure the MyModule libraries
add_geode_library(
NAME mylib
FOLDER "mylib"
SOURCES
"common.cpp"
"hello_world.cpp"
PUBLIC_HEADERS
"common.hpp"
"hello_world.hpp"
PRIVATE_DEPENDENCIES
OpenGeode::basic
install(
FILES include/geode/inspector_geosciences/project.hpp
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/geode/inspector_geosciences
COMPONENT public
)

#------------------------------------------------------------------------------------------------
# Configure the OpenGeode-InspectorGeosciences libraries
add_subdirectory(src/geode)

#------------------------------------------------------------------------------------------------
# Configure the OpenGeode-InspectorGeosciences binaries
# if(OPENGEODE_INSPECTOR_GEOSCIENCES_WITH_EXECUTABLES)
# find_package(OpenGeode-IO REQUIRED)
# find_package(OpenGeode-GeosciencesIO REQUIRED)
# add_subdirectory(src/bin)
# endif()

#------------------------------------------------------------------------------------------------
# Optional modules configuration
if(OPENGEODE_MYMODULE_WITH_TESTS)
if(OPENGEODE_INSPECTOR_GEOSCIENCES_WITH_TESTS)
# Enable testing with CTest
enable_testing()
message(STATUS "Configuring with tests")
message(STATUS "Configuring OpenGeode-InspectorGeosciences with tests")
add_subdirectory(tests)
endif()

if(OPENGEODE_MYMODULE_WITH_PYTHON)
message(STATUS "Configuring with Python bindings")
if(OPENGEODE_INSPECTOR_GEOSCIENCES_WITH_PYTHON)
message(STATUS "Configuring OpenGeode-InspectorGeosciences with Python bindings")
add_subdirectory(bindings/python)
endif()

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 - 2025 Geode-solutions
Copyright (c) 2019 - 2026 Geode-solutions

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading
Loading