Skip to content
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

Fix CMake to enable a UI-only build with unit tests #92

Merged
merged 1 commit into from
Feb 26, 2024
Merged

Fix CMake to enable a UI-only build with unit tests #92

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
12 changes: 8 additions & 4 deletions cmake/FindClangFormat.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,17 @@
function(target_clangformat TARGET)

set(options "")
set(single_value_args CONDITION)
set(multi_value_args "")
set(single_value_args "")
set(multi_value_args CONDITION)
cmake_parse_arguments( ARGS "${options}" "${single_value_args}" "${multi_value_args}" ${ARGN} )

# Skip setup if condition supplied and FALSE
if (NOT ${ARGS_CONDITION})
return()
if (DEFINED ARGS_CONDITION)
if (${${ARGS_CONDITION}})
# Do nothing, just continue
else()
return()
endif()
endif()

# Skip setup if clang-format is not available...
Expand Down
4 changes: 3 additions & 1 deletion libs/client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,11 @@ ecbuild_add_test(
ecflow_server # the server is launched to support tests
TEST_DEPENDS
u_base
CONDITION
ENABLE_SERVER # AND ENABLE_TESTS
)
target_clangformat(s_client
CONDITION ENABLE_TESTS
CONDITION ENABLE_SERVER AND ENABLE_TESTS
)

if (ENABLE_ALL_TESTS AND ENABLE_SERVER)
Expand Down
Loading