From 0b14634aa7c2efc36d35b041c5511c93eb6a0c0f Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Tue, 6 Jun 2023 07:43:40 -0400 Subject: [PATCH] cmake: turn HWMON on by default, and SERIAL ON for CI This turns HWMON on by default, and turns on serial backends in the CI systems so the default binaries include it. Signed-off-by: Robin Getz --- CI/azure/ci-ubuntu.sh | 2 +- CMakeLists.txt | 2 +- README_BUILD.md | 2 +- azure-pipelines.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CI/azure/ci-ubuntu.sh b/CI/azure/ci-ubuntu.sh index 42f6bb0b6..25ccea0b1 100644 --- a/CI/azure/ci-ubuntu.sh +++ b/CI/azure/ci-ubuntu.sh @@ -3,6 +3,6 @@ set -x uname -a echo "$PWD" mkdir build && cd build -cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DWITH_HWMON=ON -DWITH_SERIAL_BACKEND=ON -DWITH_EXAMPLES=ON -DCPP_BINDINGS=ON -DPYTHON_BINDINGS=ON -DENABLE_PACKAGING=ON -DCPACK_SYSTEM_NAME="${ARTIFACTNAME}" +cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DWITH_SERIAL_BACKEND=ON -DWITH_EXAMPLES=ON -DCPP_BINDINGS=ON -DPYTHON_BINDINGS=ON -DENABLE_PACKAGING=ON -DCPACK_SYSTEM_NAME="${ARTIFACTNAME}" make make package diff --git a/CMakeLists.txt b/CMakeLists.txt index e48910a99..f53fe17e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -284,7 +284,7 @@ if(WITH_LOCAL_BACKEND) endif() option(WITH_LOCAL_MMAP_API "Use the mmap API provided in Analog Devices' kernel (not upstream)" ON) - option(WITH_HWMON "Add compatibility with the hardware monitoring (hwmon) subsystem" OFF) + option(WITH_HWMON "Add compatibility with the hardware monitoring (hwmon) subsystem" ON) list(APPEND LIBIIO_SCAN_BACKENDS local) endif() diff --git a/README_BUILD.md b/README_BUILD.md index 596506bb8..61bc7ed4e 100644 --- a/README_BUILD.md +++ b/README_BUILD.md @@ -53,7 +53,7 @@ Cmake Options | Default | Target | Description `INSTALL_UDEV_RULE` | ON | Linux | Install a Linux udev rule for detection of USB devices | `UDEV_RULES_INSTALL_DIR` | /lib/udev/rules.d | Linux | default install path for udev rules | `WITH_LOCAL_CONFIG` | ON | Linux | Read local context attributes from /etc/libiio.ini | -`WITH_HWMON` | OFF | Linux | Add compatibility with the hwmon subsystem | +`WITH_HWMON` | ON | Linux | Add compatibility with the hwmon subsystem | `WITH_GCOV` | OFF | Linux | Build with gcov profiling flags | `OSX_FRAMEWORK` | ON | Mac | OS X frameworks provide the interfaces you need to write software for Mac. | `OSX_PACKAGE` | ON | Mac | Create a OSX package for installation on local and other machines | diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bab0ba5c8..444e02b4a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -66,9 +66,9 @@ stages: set -e mkdir build && cd build if [ "$ARTIFACTNAME" != "Linux-CentOS-7" ]; then - cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON -DWITH_DOC=ON -DWITH_MAN=ON -DCPACK_SYSTEM_NAME=${ARTIFACTNAME} + cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON -DWITH_DOC=ON -DWITH_SERIAL_BACKEND=ON -DWITH_MAN=ON -DCPACK_SYSTEM_NAME=${ARTIFACTNAME} else - # CentOS 7 does not have new enough kernel headers to support modern libusb + # CentOS 7 does not have new enough kernel headers to support modern libusb. nor libserialport cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON -DWITH_DOC=ON -DWITH_MAN=ON -DCPACK_SYSTEM_NAME=${ARTIFACTNAME} -DWITH_USB_BACKEND=OFF -DWITH_IIOD_USBD=OFF fi make