[build] cmake: Fix libssh search on windows (#7081)

This uses the package config files provided by libssh rather than the module file.
wpilibsuite · Sep 14, 2024 · 64df5e2 · 64df5e2
1 parent 994af25
commit 64df5e2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 149 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -129,7 +129,7 @@ else()
     find_package(Java REQUIRED COMPONENTS Runtime)
 endif()
 
-find_package(LIBSSH 0.7.1)
+find_package(LIBSSH CONFIG 0.7.1)
 
 set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
 if(WITH_PROTOBUF)

diff --git a/cmake/modules/FindLIBSSH.cmake b/cmake/modules/FindLIBSSH.cmake
diff --git a/datalogtool/CMakeLists.txt b/datalogtool/CMakeLists.txt
@@ -25,8 +25,7 @@ add_executable(
     ${APP_ICON_MACOSX}
 )
 wpilib_link_macos_gui(datalogtool)
-target_link_libraries(datalogtool libglass ${LIBSSH_LIBRARIES})
-target_include_directories(datalogtool SYSTEM PRIVATE ${LIBSSH_INCLUDE_DIRS})
+target_link_libraries(datalogtool libglass ssh)
 
 if(WIN32)
     set_target_properties(datalogtool PROPERTIES WIN32_EXECUTABLE YES)

diff --git a/roborioteamnumbersetter/CMakeLists.txt b/roborioteamnumbersetter/CMakeLists.txt
@@ -25,8 +25,7 @@ add_executable(
     ${APP_ICON_MACOSX}
 )
 wpilib_link_macos_gui(roborioteamnumbersetter)
-target_link_libraries(roborioteamnumbersetter libglass wpinet ${LIBSSH_LIBRARIES})
-target_include_directories(roborioteamnumbersetter SYSTEM PRIVATE ${LIBSSH_INCLUDE_DIRS})
+target_link_libraries(roborioteamnumbersetter libglass wpinet ssh)
 
 if(WIN32)
     set_target_properties(roborioteamnumbersetter PROPERTIES WIN32_EXECUTABLE YES)

diff --git a/vcpkg.json b/vcpkg.json
@@ -5,7 +5,8 @@
     "opencv",
     "fmt",
     "libuv",
-    "protobuf"
+    "protobuf",
+    "libssh"
   ],
   "builtin-baseline": "37c3e63a1306562f7f59c4c3c8892ddd50fdf992"
 }