From 32254852536a7027b1dd69a41bee30c0ced5d1e3 Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Tue, 16 Sep 2025 18:54:10 +0100 Subject: [PATCH 1/2] Remove Appveyor configuration. --- appveyor.yml | 52 ---------------------------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index d8d99e9e..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,52 +0,0 @@ -os: Visual Studio 2017 -clone_depth: 1 - -configuration: - - Release - -init: - - C:\"Program Files (x86)"\"Microsoft Visual Studio 14.0"\VC\vcvarsall.bat %PLATFORM% -install: - # Dependencies for libHackRF - - appveyor DownloadFile "https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.7z" -FileName "C:\libusb.7z" - - 7z x -y "C:\libusb.7z" -o"C:\libusb" - - appveyor DownloadFile "http://mirrors.kernel.org/sourceware/pthreads-win32/pthreads-w32-2-9-1-release.zip" -FileName "C:\pthreads-w32-release.zip" - - 7z x -y "C:\pthreads-w32-release.zip" -o"C:\pthreads" - - appveyor DownloadFile "http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/pkg-config_0.26-1_win32.zip" -FileName "C:\pkg-config_win32.zip" - - 7z x -y "C:\pkg-config_win32.zip" -o"C:\pkg-config" - # FFTW for hackrf_sweep - - curl -fsS -o "C:\fftw-3.3.5.zip" "ftp://ftp.fftw.org/pub/fftw/fftw-3.3.5-dll64.zip" - - 7z x -y "C:\fftw-3.3.5.zip" -o"C:\fftw" - - cd c:\fftw - - ps: lib /machine:x64 /def:libfftw3f-3.def - # ARM GCC for firmware builds - # - appveyor DownloadFile "https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-win32.zip" -FileName "C:\gcc-arm-none-eabi-win32.zip" - # - 7z x -y "C:\gcc-arm-none-eabi-win32.zip" -o"C:\gcc-arm-none-eabi" - # - set PATH=%PATH%;c:\gcc-arm-none-eabi\bin - -build_script: - # Host library and tools - - mkdir c:\projects\hackrf\host\build - - cd c:\projects\hackrf\host\build - - cmake -G "Visual Studio 14 2015 Win64" \ - -DLIBUSB_LIBRARIES="C:\libusb\MS64\dll\libusb-1.0.lib" \ - -DLIBUSB_INCLUDE_DIR="C:\libusb\include\libusb-1.0" \ - -DTHREADS_PTHREADS_INCLUDE_DIR=c:\pthreads\Pre-built.2\include \ - -DTHREADS_PTHREADS_WIN32_LIBRARY=c:\pthreads\Pre-built.2\lib\x64\pthreadVC2.lib \ - -DPKG_CONFIG_EXECUTABLE="C:\pkg-config\bin\pkg-config.exe" \ - -DFFTW_INCLUDES=C:\fftw \ - -DFFTW_LIBRARIES=C:\fftw\libfftw3f-3.lib \ - .. - - msbuild HackRF.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - # Firmware - # - cd c:\projects\hackrf\ - # - git submodule init - # - git submodule update - # - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER && firmware/appveyor.sh"' - -after_build: - - 7z a %APPVEYOR_BUILD_FOLDER%\HackRF-Windows-%APPVEYOR_REPO_COMMIT%.zip %APPVEYOR_BUILD_FOLDER%\host\build\libhackrf\src\Release\* %APPVEYOR_BUILD_FOLDER%\host\build\hackrf-tools\src\Release\* - -artifacts: - - path: HackRF-Windows-%APPVEYOR_REPO_COMMIT%.zip - name: HackRF-Windows-%APPVEYOR_REPO_COMMIT% From 5c394520403c40b656a7400681e4ae167943e43f Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Tue, 16 Sep 2025 18:57:31 +0100 Subject: [PATCH 2/2] Bump CMake minimum version to 3.5.0. This is the minimum now accepted by latest CMake releases. --- firmware/CMakeLists.txt | 2 +- firmware/blinky/CMakeLists.txt | 2 +- firmware/hackrf_usb/CMakeLists.txt | 2 +- host/CMakeLists.txt | 2 +- host/hackrf-tools/CMakeLists.txt | 2 +- host/libhackrf/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt index c458b7f1..337353fa 100644 --- a/firmware/CMakeLists.txt +++ b/firmware/CMakeLists.txt @@ -20,7 +20,7 @@ # Top directory CMake project for HackRF firmware -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.5.0) set(CMAKE_TOOLCHAIN_FILE toolchain-arm-cortex-m.cmake) project (hackrf_firmware_all C) diff --git a/firmware/blinky/CMakeLists.txt b/firmware/blinky/CMakeLists.txt index dfecc320..b44ea591 100644 --- a/firmware/blinky/CMakeLists.txt +++ b/firmware/blinky/CMakeLists.txt @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.5.0) set(CMAKE_TOOLCHAIN_FILE ../toolchain-arm-cortex-m.cmake) project(blinky C) diff --git a/firmware/hackrf_usb/CMakeLists.txt b/firmware/hackrf_usb/CMakeLists.txt index d1cc8bbd..8df34a7c 100644 --- a/firmware/hackrf_usb/CMakeLists.txt +++ b/firmware/hackrf_usb/CMakeLists.txt @@ -18,7 +18,7 @@ # Boston, MA 02110-1301, USA. # -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.5.0) set(CMAKE_TOOLCHAIN_FILE ../toolchain-arm-cortex-m.cmake) project(hackrf_usb C) diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 4eaaf314..45c0f8b6 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -1,6 +1,6 @@ #top dir cmake project for libhackrf + tools -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5.0) project (HackRF C) set(CMAKE_C_FLAGS "$ENV{CFLAGS}" CACHE STRING "C Flags") diff --git a/host/hackrf-tools/CMakeLists.txt b/host/hackrf-tools/CMakeLists.txt index efb5d936..1b6d6ebf 100644 --- a/host/hackrf-tools/CMakeLists.txt +++ b/host/hackrf-tools/CMakeLists.txt @@ -21,7 +21,7 @@ # Based heavily upon the libftdi cmake setup. -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5.0) project(hackrf-tools C) set(PACKAGE hackrf-tools) include(${PROJECT_SOURCE_DIR}/../cmake/set_release.cmake) diff --git a/host/libhackrf/CMakeLists.txt b/host/libhackrf/CMakeLists.txt index 455470c1..e56e24aa 100644 --- a/host/libhackrf/CMakeLists.txt +++ b/host/libhackrf/CMakeLists.txt @@ -21,7 +21,7 @@ # Based heavily upon the libftdi cmake setup. -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5.0) project(libhackrf C) set(MAJOR_VERSION 0) set(MINOR_VERSION 9)