Skip to content

Commit

Permalink
Merge pull request #1429 from contour-terminal/fix/ci-windows-ssh
Browse files Browse the repository at this point in the history
Fixes Windows built accidentally not including builtin-SSH support
  • Loading branch information
christianparpart authored Jan 28, 2024
2 parents c5c9ddc + cf80f13 commit cb75bac
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
<release version="0.4.2" urgency="medium" type="development">
<description>
<ul>
<li>Fixes Windows built accidentally not including builtin-SSH support (#1427).</li>
<li>Fixes some text run segmentation problems, e.g., not making use of some programming ligatures (#395).</li>
<li>Fixes mouse scroll wheel events going into the wrong direction if `Alt` modifier was pressed at the same time (#394).</li>
<li>Fixes `scripts/install-deps.sh` for openSuSE (Tumbleweed) to install the correct dependencies.</li>
Expand Down
7 changes: 6 additions & 1 deletion src/vtpty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ if(_include_SshSession_module)
add_compile_definitions(VTPTY_LIBSSH2)
list(APPEND vtpty_SOURCES SshSession.cpp)
list(APPEND vtpty_HEADERS SshSession.h)
message(STATUS "[vtpty] Builtin-SSH support enabled")
else()
message(STATUS "[vtpty] Builtin-SSH support disabled")
endif()

if(LINUX)
Expand All @@ -68,8 +71,10 @@ set_target_properties(vtpty PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY_EXE}")
if(FLATPAK)
target_compile_definitions(vtpty PRIVATE FLATPAK=1)
endif()
if(_include_SshSession_module)
target_compile_definitions(vtpty PUBLIC VTPTY_LIBSSH2=1)
endif()
if(LIBSSH2_FOUND)
target_compile_definitions(vtpty PRIVATE VTPTY_LIBSSH2=1)
target_compile_options(vtpty PRIVATE ${LIBSSH2_CFLAGS_OTHER})
target_include_directories(vtpty PRIVATE ${LIBSSH2_INCLUDE_DIRS})
target_link_libraries(vtpty PRIVATE ${LIBSSH2_LINK_LIBRARIES})
Expand Down

0 comments on commit cb75bac

Please sign in to comment.