Skip to content

Make CMake keys enabled by default #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aobolensk wants to merge 1 commit into from
Closed

Make CMake keys enabled by default #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ jobs:
run: >
cmake -S . -B build
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
-G Ninja -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
-G Ninja
-D CMAKE_BUILD_TYPE=RELEASE
env:
CC: gcc-14
Expand Down
20 changes: 6 additions & 14 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ jobs:
run: >
cmake -S . -B build
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
-G Ninja -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
-G Ninja
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
env:
CC: gcc-14
Expand Down Expand Up @@ -214,8 +213,7 @@ jobs:
run: >
cmake -S . -B build
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
-G Ninja -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
-G Ninja
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=install
env:
CC: clang-19
Expand Down Expand Up @@ -373,8 +371,7 @@ jobs:
run: >
cmake -S . -B build
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
-G Ninja -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
-G Ninja
-D CMAKE_BUILD_TYPE=RELEASE -D ENABLE_ADDRESS_SANITIZER=ON -D ENABLE_UB_SANITIZER=ON
-D CMAKE_INSTALL_PREFIX=install
env:
Expand Down Expand Up @@ -542,10 +539,10 @@ jobs:
run: >
cmake -S . -B build
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
-G Ninja -D USE_SEQ=ON -D USE_MPI=ON -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
-G Ninja
-DCMAKE_C_FLAGS="-I$(brew --prefix)/opt/libomp/include"
-DCMAKE_CXX_FLAGS="-I$(brew --prefix)/opt/libomp/include"
-D CMAKE_BUILD_TYPE=RELEASE -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
-D CMAKE_BUILD_TYPE=RELEASE
-DCMAKE_INSTALL_PREFIX=install
- name: Build project
run: |
Expand Down Expand Up @@ -706,8 +703,6 @@ jobs:
run: >
cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
-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 -DCMAKE_INSTALL_PREFIX=install
- name: Build project
shell: bash
Expand Down Expand Up @@ -872,8 +867,6 @@ jobs:
run: >
cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
-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 -DCMAKE_INSTALL_PREFIX=install
env:
CC: clang-cl
Expand Down Expand Up @@ -1028,8 +1021,7 @@ jobs:
run: >
cmake -S . -B build
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
-G Ninja -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
-G Ninja
-D CMAKE_BUILD_TYPE=RELEASE
-D CMAKE_VERBOSE_MAKEFILE=ON
-D USE_COVERAGE=ON
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ jobs:
python3 -m pip install -r docs/requirements.txt
- name: Configure project
run: >
cmake -S . -B build -D USE_DOCS=ON
cmake -S . -B build -DUSE_DOCS=ON
-DUSE_MPI=OFF -DUSE_SEQ=OFF -DUSE_OMP=OFF -DUSE_TBB=OFF -DUSE_STL=OFF
- name: Build i18n
run: |
cmake --build build -t docs_gettext
Expand All @@ -51,8 +52,9 @@ jobs:
run: |
python3 -m pip install -r requirements.txt
- name: CMake configure
run: |
run: >
cmake -S . -B build -DUSE_SCOREBOARD=ON
-DUSE_MPI=OFF -DUSE_SEQ=OFF -DUSE_OMP=OFF -DUSE_TBB=OFF -DUSE_STL=OFF
- name: CMake build
run: |
cmake --build build --parallel
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/static-analysis-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ jobs:
cmake_command: >
cmake -S . -B build
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
-G Ninja
-D USE_SEQ=ON -D USE_MPI=ON
-D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-D USE_SYSTEM_OPENCV=ON
config_file: .clang-tidy
Expand Down Expand Up @@ -64,9 +61,6 @@ jobs:
cmake -S . -B build
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
-G Ninja
-D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON
-D USE_SEQ=ON -D USE_MPI=ON
-D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
-D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-D USE_SYSTEM_OPENCV=ON
config_file: .clang-tidy
Expand Down
2 changes: 2 additions & 0 deletions cmake/configure.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ if(MSVC)
option(gtest_force_shared_crt "" TRUE)
endif(MSVC)

option(USE_SEQ ON)
Copy link
Copy Markdown
Member

@allnes allnes May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please move it to modes


if (APPLE)
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG TRUE)
endif(APPLE)
Expand Down
4 changes: 2 additions & 2 deletions cmake/modes.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ MACRO(SUBDIRLIST result curdir)
SET(${result} ${dirlist})
ENDMACRO()

option(USE_FUNC_TESTS OFF)
option(USE_FUNC_TESTS ON)
if( USE_FUNC_TESTS )
message( STATUS "Enable functional tests" )
add_compile_definitions(USE_FUNC_TESTS)
endif( USE_FUNC_TESTS )

option(USE_PERF_TESTS OFF)
option(USE_PERF_TESTS ON)
if( USE_PERF_TESTS )
message( STATUS "Enable performance tests" )
add_compile_definitions(USE_PERF_TESTS)
Expand Down
2 changes: 1 addition & 1 deletion cmake/mpi.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
option(USE_MPI OFF)
option(USE_MPI ON)
if( USE_MPI )
find_package( MPI )
if( MPI_FOUND )
Expand Down
2 changes: 1 addition & 1 deletion cmake/onetbb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
option(USE_TBB OFF)
option(USE_TBB ON)
if( USE_TBB )
# Build Core OneTBB components
include_directories(${CMAKE_SOURCE_DIR}/3rdparty/onetbb/include)
Expand Down
2 changes: 1 addition & 1 deletion cmake/openmp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
option(USE_OMP OFF)
option(USE_OMP ON)
if( USE_OMP )
find_package( OpenMP )
if( OpenMP_FOUND )
Expand Down
2 changes: 1 addition & 1 deletion cmake/threads.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
option(USE_STL OFF)
option(USE_STL ON)
if( USE_STL )
find_package( Threads )
endif( USE_STL )
2 changes: 1 addition & 1 deletion docs/user_guide/build.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Navigate to a source code folder.
.. code-block:: bash

mkdir build && cd build
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 ..
cmake -D USE_FUNC_TESTS=ON -D USE_PERF_TESTS=ON -D CMAKE_BUILD_TYPE=Release ..
Copy link
Copy Markdown
Member

@allnes allnes May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please correct it for func and pref tests too


*Help on CMake keys:*

Expand Down
Loading