Skip to content

Fix add_definitions(-DWITH_SERVER) to use target_compile_definitions in three CMakeLists.txt files #5036

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
Copilot wants to merge 3 commits into from
Closed

Fix add_definitions(-DWITH_SERVER) to use target_compile_definitions in three CMakeLists.txt files #5036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34d89bf
Initial plan
Copilot Jul 7, 2026
a9181f8
Fix add_definitions WITH_SERVER to use target_compile_definitions
Copilot Jul 7, 2026
f61e025
Add WITH_SERVER to sftp_client and ssh_client targets to fix build
Copilot Jul 8, 2026
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
8 changes: 6 additions & 2 deletions src/ssh/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
#

function(add_ssh_target TARGET_NAME)
add_definitions(-DWITH_SERVER)

add_library(${TARGET_NAME} STATIC
libssh_scope_guard.cpp
openssh_key_provider.cpp
Expand All @@ -24,6 +22,8 @@ function(add_ssh_target TARGET_NAME)
plain_ssh_session.cpp
ssh_client_key_provider.cpp)

target_compile_definitions(${TARGET_NAME} PRIVATE WITH_SERVER)

target_link_libraries(${TARGET_NAME}
fmt::fmt-header-only
ssh
Expand All @@ -43,6 +43,8 @@ function(add_sftp_client_target TARGET_NAME)
sftp_utils.cpp
plain_ssh_session.cpp)

target_compile_definitions(${TARGET_NAME} PRIVATE WITH_SERVER)

target_link_libraries(${TARGET_NAME}
fmt::fmt-header-only
ssh
Expand All @@ -60,6 +62,8 @@ function(add_ssh_client_target TARGET_NAME)
ssh_client.cpp
plain_ssh_session.cpp)

target_compile_definitions(${TARGET_NAME} PRIVATE WITH_SERVER)

target_link_libraries(${TARGET_NAME}
console
fmt::fmt-header-only
Expand Down
4 changes: 2 additions & 2 deletions src/sshfs_mount/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

set(CMAKE_AUTOMOC ON)
function(add_sshfs_mount_target TARGET_NAME)
add_definitions(-DWITH_SERVER)

add_library(${TARGET_NAME} STATIC
sshfs_mount.cpp
sshfs_mount_handler.cpp
Expand All @@ -24,6 +22,8 @@ function(add_sshfs_mount_target TARGET_NAME)
sshfs_mount.h
${CMAKE_SOURCE_DIR}/include/multipass/sshfs_mount/sshfs_mount_handler.h)

target_compile_definitions(${TARGET_NAME} PRIVATE WITH_SERVER)

target_link_libraries(${TARGET_NAME}
fmt::fmt-header-only
logger
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ target_include_directories(multipass_cpp_tests
PRIVATE ${CMAKE_SOURCE_DIR}/src/platform/backends
)

add_definitions(-DWITH_SERVER)
target_compile_definitions(multipass_cpp_tests PRIVATE WITH_SERVER)
target_compile_definitions(ssh_test PRIVATE
${c_mock_defines})
target_compile_definitions(sshfs_mount_test PRIVATE
Expand Down
Loading