Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-26 01:35:16 +03:00
Code Activity

chore: CMake 4.0 compatibility (#6070)

Browse source
This commit is contained in:
Peter Feerick 2025-04-11 12:34:18 +10:00 • committed by GitHub
parent 02ebd4604e
commit 31fe413190
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmake/FetchMaxLibQt.cmake
View file

@ -5,7 +5,7 @@ include(FetchContent)
FetchContent_Declare( FetchContent_Declare(
maxLibQt maxLibQt
GIT_REPOSITORY https://github.com/edgetx/maxLibQt GIT_REPOSITORY https://github.com/edgetx/maxLibQt
GIT_TAG b5418f76cc4891e09f4e21276175d39dbb130f66 GIT_TAG ac1988ffd005cd15a8449b92150ce6c08574a4f1
) )
FetchContent_MakeAvailable(maxLibQt) FetchContent_MakeAvailable(maxLibQt)

2
cmake/FetchMiniz.cmake
View file

@ -5,7 +5,7 @@ include(FetchContent)
FetchContent_Declare( FetchContent_Declare(
miniz miniz
GIT_REPOSITORY https://github.com/richgel999/miniz GIT_REPOSITORY https://github.com/richgel999/miniz
GIT_TAG 293d4db1b7d0ffee9756d035b9ac6f7431ef8492 # v3.0.2 GIT_TAG 89d7a5f6c3ce8893ea042b0a9d2a2d9975589ac9
) )
FetchContent_MakeAvailable(miniz) FetchContent_MakeAvailable(miniz)

2
cmake/FetchYamlCpp.cmake
View file

@ -5,7 +5,7 @@ include(FetchContent)
FetchContent_Declare( FetchContent_Declare(
yaml-cpp yaml-cpp
GIT_REPOSITORY https://github.com/jbeder/yaml-cpp GIT_REPOSITORY https://github.com/jbeder/yaml-cpp
GIT_TAG f7320141120f720aecc4c32be25586e7da9eb978 # v0.8.0 GIT_TAG 28f93bdec6387d42332220afa9558060c8016795
) )
FetchContent_MakeAvailable(yaml-cpp) FetchContent_MakeAvailable(yaml-cpp)

4
cmake/GenericDefinitions.cmake
View file

@ -2,10 +2,6 @@
# https://cmake.org/cmake/help/latest/policy/CMP0020.html # https://cmake.org/cmake/help/latest/policy/CMP0020.html
cmake_policy(SET CMP0020 NEW) cmake_policy(SET CMP0020 NEW)
# Allow keyword and plain target_link_libraries() signatures to be mixed
# https://cmake.org/cmake/help/latest/policy/CMP0023.html
cmake_policy(SET CMP0023 OLD)
# Use @rpath in a target's install name on MacOS X for locating shared libraries # Use @rpath in a target's install name on MacOS X for locating shared libraries
# https://cmake.org/cmake/help/latest/policy/CMP0042.html # https://cmake.org/cmake/help/latest/policy/CMP0042.html
if(POLICY CMP0042) if(POLICY CMP0042)

3
companion/src/CMakeLists.txt
View file

@ -361,9 +361,6 @@ elseif(PCB STREQUAL PL18)
else() else()
string(TOLOWER ${PCB} FLAVOUR) string(TOLOWER ${PCB} FLAVOUR)
endif() endif()
if(POLICY CMP0026)
cmake_policy(SET CMP0026 OLD) # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html
endif()
include(FindDfuutil) include(FindDfuutil)
include(FindLibusb1) include(FindLibusb1)