Skip to content

Commit bbf3fc6

Browse files
committed
Make CMake keys enabled by default
1 parent 2914e47 commit bbf3fc6

10 files changed

Lines changed: 17 additions & 19 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +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
44+
-G Ninja
4545
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
4646
-D CMAKE_BUILD_TYPE=RELEASE
4747
env:

.github/workflows/main.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +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
57+
-G Ninja
5858
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
5959
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
6060
env:
@@ -214,7 +214,7 @@ jobs:
214214
run: >
215215
cmake -S . -B build
216216
-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
217+
-G Ninja
218218
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
219219
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
220220
env:
@@ -373,7 +373,7 @@ jobs:
373373
run: >
374374
cmake -S . -B build
375375
-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
376+
-G Ninja
377377
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
378378
-D CMAKE_BUILD_TYPE=RELEASE -D ENABLE_ADDRESS_SANITIZER=ON -D ENABLE_UB_SANITIZER=ON
379379
-D CMAKE_INSTALL_PREFIX=install
@@ -542,7 +542,7 @@ jobs:
542542
run: >
543543
cmake -S . -B build
544544
-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
545+
-G Ninja
546546
-DCMAKE_C_FLAGS="-I$(brew --prefix)/opt/libomp/include"
547547
-DCMAKE_CXX_FLAGS="-I$(brew --prefix)/opt/libomp/include"
548548
-D CMAKE_BUILD_TYPE=RELEASE -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
@@ -706,7 +706,6 @@ jobs:
706706
run: >
707707
cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl
708708
-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
710709
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
711710
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
712711
- name: Build project
@@ -872,7 +871,6 @@ jobs:
872871
run: >
873872
cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
874873
-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
876874
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
877875
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
878876
env:
@@ -1028,7 +1026,7 @@ jobs:
10281026
run: >
10291027
cmake -S . -B build
10301028
-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
1029+
-G Ninja
10321030
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
10331031
-D CMAKE_BUILD_TYPE=RELEASE
10341032
-D CMAKE_VERBOSE_MAKEFILE=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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ jobs:
2727
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
2828
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
2929
-G Ninja
30-
-D USE_SEQ=ON -D USE_MPI=ON
31-
-D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
3230
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
3331
-D USE_SYSTEM_OPENCV=ON
3432
config_file: .clang-tidy
@@ -65,8 +63,6 @@ jobs:
6563
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
6664
-G Ninja
6765
-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
7066
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
7167
-D USE_SYSTEM_OPENCV=ON
7268
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/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 )

docs/user_guide/build.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Navigate to a source code folder.
88
.. code-block:: bash
99
1010
mkdir build && cd build
11-
cmake -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON -D CMAKE_BUILD_TYPE=Release ..
11+
cmake -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON -D CMAKE_BUILD_TYPE=Release ..
1212
1313
*Help on CMake keys:*
1414

0 commit comments

Comments
 (0)