Skip to content

Commit

Permalink
Merge branch 'main' into json-parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
boulderdaze committed Jun 14, 2023
2 parents 0685707 + 2c5ec74 commit 7cdd41a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ option(ENABLE_OPENMP "Enable OpenMP support" OFF)
option(ENABLE_COVERAGE "Enable code coverage output" OFF)
option(ENABLE_MEMCHECK "Enable memory checking in tests" OFF)
option(ENABLE_JSON "Enable json configureation file reading" ON)
option(ENABLE_REGESSION_TESTS "Enable regression tests against the old pre-processed version of micm" ON)
option(ENABLE_REGRESSION_TESTS "Enable regression tests against the old pre-processed version of micm" ON)
option(BUILD_DOCS "Build the documentation" OFF)

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.nvhpc
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ RUN mkdir /build \
&& cmake \
-D CMAKE_BUILD_TYPE=debug \
-D ENABLE_CLANG_TIDY:BOOL=FALSE \
-D ENABLE_REGESSION_TESTS:BOOL=FALSE \
-D ENABLE_REGRESSION_TESTS:BOOL=FALSE \
../micm \
&& make -j 8 install

Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set(CMAKE_CXX_CLANG_TIDY "")

add_subdirectory(unit)

if(ENABLE_REGESSION_TESTS)
if(ENABLE_REGRESSION_TESTS)
add_subdirectory(regression)
endif()

Expand Down

0 comments on commit 7cdd41a

Please sign in to comment.