Skip to content

Commit 08a96d6

Browse files
authored
Merge pull request GeodynamicWorldBuilder#842 from MFraters/add_litho1.0_support_v2
Add litho1.0 to the world builder
2 parents d543a0f + fd79437 commit 08a96d6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+4878
-231
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ jobs:
194194
- name: Configure CMake
195195
shell: bash
196196
working-directory: ${{github.workspace}}/build
197-
run: cmake -G"${{ matrix.build_system }}" $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DWB_ENABLE_PYTHON=OFF -DWB_MAKE_FORTRAN_WRAPPER=OFF
197+
run: cmake -G"${{ matrix.build_system }}" $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DWB_ENABLE_PYTHON=OFF -DWB_UNITY_BUILD=OFF -DWB_RUN_TESTS_WITH_GDB=OFF -DWB_RUN_TESTS_WITH_VALGRIND=OFF -DWB_MAKE_FORTRAN_WRAPPER=OFF
198198

199199
- name: Build gwb
200200
working-directory: ${{github.workspace}}/build

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ elseif(APPLE)
450450
SET(WB_COMPILER_OPTIONS_PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wpointer-arith -Wwrite-strings -Wsynth -Wsign-compare -Woverloaded-virtual -Wno-literal-range -Wno-parentheses -Wno-unused-local-typedefs -Wcast-qual -fstrict-aliasing -Wuninitialized -Werror=uninitialized -Wdangling-else>)
451451
else()
452452
#MSVS
453-
SET(WB_COMPILER_OPTIONS_PRIVATE $<$<COMPILE_LANGUAGE:CXX>:/W3 /EHsc>)
453+
SET(WB_COMPILER_OPTIONS_PRIVATE $<$<COMPILE_LANGUAGE:CXX>:/W3 /EHsc /bigobj>)
454454
SET(WB_LINKER_OPTIONS /WHOLEARCHIVE:${CMAKE_CURRENT_BINARY_DIR}/lib/WorldBuilder.lib)
455455
endif()
456456

doc/indent

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fi
3434
# collect all header and source files and process them in batches of 50 files
3535
# with up to 10 in parallel
3636

37-
find include source tests/unit_tests \( -name '*.cc' -o -name '*.h' \) -print0 | xargs -0 -n 50 -P 10 astyle --options=doc/astyle-2.04.rc
37+
find include/world_builder include/visualization include/app source tests/unit_tests \( -name '*.cc' -o -name '*.h' \) -print0 | xargs -0 -n 50 -P 10 astyle --options=doc/astyle-2.04.rc
3838
# remove execute permission on source files:
3939
find include source tests/unit_tests \( -name '*.cc' -o -name '*.h' -o -name '*.prm' \) -print0 | xargs -0 -n 50 -P 10 chmod -x
4040

doc/world_builder_declarations.schema.json

Lines changed: 256 additions & 36 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)