Skip to content

Commit 255dbdf

Browse files
aobolenskaobolensk
committed
Make CMake keys enabled by default
1 parent 2914e47 commit 255dbdf

11 files changed

Lines changed: 20 additions & 31 deletions

File tree

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ jobs:
4141
run: >
4242
cmake -S . -B build
4343
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
44-
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
45-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
44+
-G Ninja
4645
-D CMAKE_BUILD_TYPE=RELEASE
4746
env:
4847
CC: gcc-14

‎.github/workflows/main.yml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ jobs:
5454
run: >
5555
cmake -S . -B build
5656
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
57-
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
58-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
57+
-G Ninja
5958
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
6059
env:
6160
CC: gcc-14
@@ -214,8 +213,7 @@ jobs:
214213
run: >
215214
cmake -S . -B build
216215
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
217-
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
218-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
216+
-G Ninja
219217
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
220218
env:
221219
CC: clang-19
@@ -373,8 +371,7 @@ jobs:
373371
run: >
374372
cmake -S . -B build
375373
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
376-
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
377-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
374+
-G Ninja
378375
-D CMAKE_BUILD_TYPE=RELEASE -D ENABLE_ADDRESS_SANITIZER=ON -D ENABLE_UB_SANITIZER=ON
379376
-D CMAKE_INSTALL_PREFIX=install
380377
env:
@@ -542,10 +539,10 @@ jobs:
542539
run: >
543540
cmake -S . -B build
544541
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
545-
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
542+
-G Ninja
546543
-DCMAKE_C_FLAGS="-I$(brew --prefix)/opt/libomp/include"
547544
-DCMAKE_CXX_FLAGS="-I$(brew --prefix)/opt/libomp/include"
548-
-D CMAKE_BUILD_TYPE=RELEASE -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
545+
-D CMAKE_BUILD_TYPE=RELEASE
549546
-DCMAKE_INSTALL_PREFIX=install
550547
- name: Build project
551548
run: |
@@ -706,8 +703,6 @@ jobs:
706703
run: >
707704
cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl
708705
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
709-
-D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
710-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
711706
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
712707
- name: Build project
713708
shell: bash
@@ -872,8 +867,6 @@ jobs:
872867
run: >
873868
cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
874869
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
875-
-D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
876-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
877870
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
878871
env:
879872
CC: clang-cl
@@ -1028,8 +1021,7 @@ jobs:
10281021
run: >
10291022
cmake -S . -B build
10301023
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
1031-
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
1032-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
1024+
-G Ninja
10331025
-D CMAKE_BUILD_TYPE=RELEASE
10341026
-D CMAKE_VERBOSE_MAKEFILE=ON
10351027
-D USE_COVERAGE=ON

‎.github/workflows/pages.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ jobs:
2525
python3 -m pip install -r docs/requirements.txt
2626
- name: Configure project
2727
run: >
28-
cmake -S . -B build -D USE_DOCS=ON
28+
cmake -S . -B build -DUSE_DOCS=ON
29+
-DUSE_MPI=OFF -DUSE_SEQ=OFF -DUSE_OMP=OFF -DUSE_TBB=OFF -DUSE_STL=OFF
2930
- name: Build i18n
3031
run: |
3132
cmake --build build -t docs_gettext
@@ -51,8 +52,9 @@ jobs:
5152
run: |
5253
python3 -m pip install -r requirements.txt
5354
- name: CMake configure
54-
run: |
55+
run: >
5556
cmake -S . -B build -DUSE_SCOREBOARD=ON
57+
-DUSE_MPI=OFF -DUSE_SEQ=OFF -DUSE_OMP=OFF -DUSE_TBB=OFF -DUSE_STL=OFF
5658
- name: CMake build
5759
run: |
5860
cmake --build build --parallel

‎.github/workflows/static-analysis-pr.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ jobs:
2525
cmake_command: >
2626
cmake -S . -B build
2727
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
28-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
2928
-G Ninja
30-
-D USE_SEQ=ON -D USE_MPI=ON
31-
-D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
3229
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
3330
-D USE_SYSTEM_OPENCV=ON
3431
config_file: .clang-tidy
@@ -64,9 +61,6 @@ jobs:
6461
cmake -S . -B build
6562
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
6663
-G Ninja
67-
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
68-
-D USE_SEQ=ON -D USE_MPI=ON
69-
-D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
7064
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
7165
-D USE_SYSTEM_OPENCV=ON
7266
config_file: .clang-tidy

‎cmake/configure.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ if(MSVC)
22
option(gtest_force_shared_crt "" TRUE)
33
endif(MSVC)
44

5+
option(USE_SEQ ON)
6+
57
if (APPLE)
68
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG TRUE)
79
endif(APPLE)

‎cmake/modes.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ MACRO(SUBDIRLIST result curdir)
1111
SET(${result} ${dirlist})
1212
ENDMACRO()
1313

14-
option(USE_FUNC_TESTS OFF)
14+
option(USE_FUNC_TESTS ON)
1515
if( USE_FUNC_TESTS )
1616
message( STATUS "Enable functional tests" )
1717
add_compile_definitions(USE_FUNC_TESTS)
1818
endif( USE_FUNC_TESTS )
1919

20-
option(USE_PERF_TESTS OFF)
20+
option(USE_PERF_TESTS ON)
2121
if( USE_PERF_TESTS )
2222
message( STATUS "Enable performance tests" )
2323
add_compile_definitions(USE_PERF_TESTS)

‎cmake/mpi.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
option(USE_MPI OFF)
1+
option(USE_MPI ON)
22
if( USE_MPI )
33
find_package( MPI )
44
if( MPI_FOUND )

‎cmake/onetbb.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
option(USE_TBB OFF)
1+
option(USE_TBB ON)
22
if( USE_TBB )
33
# Build Core OneTBB components
44
include_directories(${CMAKE_SOURCE_DIR}/3rdparty/onetbb/include)

‎cmake/openmp.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
option(USE_OMP OFF)
1+
option(USE_OMP ON)
22
if( USE_OMP )
33
find_package( OpenMP )
44
if( OpenMP_FOUND )

‎cmake/threads.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
option(USE_STL OFF)
1+
option(USE_STL ON)
22
if( USE_STL )
33
find_package( Threads )
44
endif( USE_STL )

0 commit comments

Comments
 (0)