Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] Fix various warnings in cmake builds (#4081)

Browse Source
This commit is contained in:
Thad House
2022-03-07 22:36:42 -08:00
committed by GitHub
parent bc39a1a293
commit ab7ac4fbb9
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/FindLIBSSH.cmake
View File

@@ -110,7 +110,7 @@ else()
set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY} ${LIBSSH_THREADS_LIBRARY})
mark_as_advanced(LIBSSH_INCLUDE_DIRS LIBSSH_LIBRARIES)
find_package_handle_standard_args(LibSSH FOUND_VAR LIBSSH_FOUND
find_package_handle_standard_args(LIBSSH FOUND_VAR LIBSSH_FOUND
REQUIRED_VARS LIBSSH_INCLUDE_DIRS LIBSSH_LIBRARIES
VERSION_VAR LIBSSH_VERSION)
endif()

2
cmake/toolchains/gnu.toolchain.cmake
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.3.0)
# load settings in case of "try compile"
set(TOOLCHAIN_CONFIG_FILE "${WPILIB_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/toolchain.config.cmake")

2
googletest/CMakeLists.txt.in
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.2)
cmake_minimum_required(VERSION 3.3.0)
project(googletest-download NONE)

2
imgui/CMakeLists.txt.in
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.2)
cmake_minimum_required(VERSION 3.3.0)
project(imgui-download NONE)

11
wpiutil/CMakeLists.txt
View File

@@ -76,10 +76,12 @@ endif()
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
if (NOT MSVC AND NOT APPLE)
if (NOT MSVC AND NOT APPLE AND NOT ANDROID)
find_library(ATOMIC NAMES atomic libatomic.so.1)
if (ATOMIC)
message(STATUS "Found libatomic: ${ATOMIC}")
else()
message(STATUS "libatomic not found. If build fails, install libatomic")
endif()
endif()
@@ -147,7 +149,12 @@ if (MSVC)
target_compile_definitions(wpiutil PRIVATE -D_CRT_SECURE_NO_WARNINGS)
endif()
wpilib_target_warnings(wpiutil)
target_link_libraries(wpiutil Threads::Threads ${CMAKE_DL_LIBS} ${ATOMIC})
target_link_libraries(wpiutil Threads::Threads ${CMAKE_DL_LIBS})
if (ATOMIC)
target_link_libraries(wpiutil ${ATOMIC})
endif()
if (NOT USE_VCPKG_FMTLIB)
target_sources(wpiutil PRIVATE ${fmtlib_native_src})