From 90cfa00115fc6c522db369ee87797d5c85f8d570 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Fri, 7 Oct 2022 22:53:22 -0700 Subject: [PATCH] [build] cmake: Fix libssh include directory order (#4459) This broke the build if the directory where libssh was installed also contained a system libuv install. --- datalogtool/CMakeLists.txt | 2 +- roborioteamnumbersetter/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datalogtool/CMakeLists.txt b/datalogtool/CMakeLists.txt index a5e23581e4..f3baa1dfd9 100644 --- a/datalogtool/CMakeLists.txt +++ b/datalogtool/CMakeLists.txt @@ -20,7 +20,7 @@ endif() add_executable(datalogtool ${datalogtool_src} ${datalogtool_resources_src} ${datalogtool_rc} ${APP_ICON_MACOSX}) wpilib_link_macos_gui(datalogtool) target_link_libraries(datalogtool libglass ${LIBSSH_LIBRARIES}) -target_include_directories(datalogtool PRIVATE ${LIBSSH_INCLUDE_DIRS}) +target_include_directories(datalogtool SYSTEM PRIVATE ${LIBSSH_INCLUDE_DIRS}) if (WIN32) set_target_properties(datalogtool PROPERTIES WIN32_EXECUTABLE YES) diff --git a/roborioteamnumbersetter/CMakeLists.txt b/roborioteamnumbersetter/CMakeLists.txt index 3895baf3bd..13a079a6a2 100644 --- a/roborioteamnumbersetter/CMakeLists.txt +++ b/roborioteamnumbersetter/CMakeLists.txt @@ -20,7 +20,7 @@ endif() add_executable(roborioteamnumbersetter ${rtns_src} ${rtns_resources_src} ${rtns_rc} ${APP_ICON_MACOSX}) wpilib_link_macos_gui(roborioteamnumbersetter) target_link_libraries(roborioteamnumbersetter libglass wpinet ${LIBSSH_LIBRARIES}) -target_include_directories(roborioteamnumbersetter PRIVATE ${LIBSSH_INCLUDE_DIRS}) +target_include_directories(roborioteamnumbersetter SYSTEM PRIVATE ${LIBSSH_INCLUDE_DIRS}) if (WIN32) set_target_properties(roborioteamnumbersetter PROPERTIES WIN32_EXECUTABLE YES)