From a138ec259f2659de90badb76adca34d7ad409046 Mon Sep 17 00:00:00 2001 From: Marius Greuel Date: Tue, 27 Dec 2022 16:35:36 +0100 Subject: [PATCH] CMake: Rename option USE_EXTERNAL to USE_EXTERNAL_LIBS --- .github/workflows/build.yml | 2 +- CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c47ce1d8..a2649bcf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -217,7 +217,7 @@ jobs: -D CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO="/DEBUG /INCREMENTAL:NO /LTCG /OPT:REF /OPT:ICF" -D HAVE_LIBREADLINE=HAVE_LIBREADLINE-NOTFOUND -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - -D USE_EXTERNAL=1 + -D USE_EXTERNAL_LIBS=1 -B build - name: Build run: cmake --build build --config ${{env.BUILD_TYPE}} diff --git a/CMakeLists.txt b/CMakeLists.txt index 663077ea..eed335f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ option(BUILD_DOC "Enable building documents" OFF) option(HAVE_LINUXGPIO "Enable Linux sysfs GPIO support" OFF) option(HAVE_LINUXSPI "Enable Linux SPI support" OFF) option(HAVE_PARPORT "Enable parallel port support" OFF) -option(USE_EXTERNAL "Use external libraries from AVRDUDE GitHub repositories" OFF) +option(USE_EXTERNAL_LIBS "Use external libraries from AVRDUDE GitHub repositories" OFF) option(USE_LIBUSBWIN32 "Prefer libusb-win32 over libusb" OFF) option(DEBUG_CMAKE "Enable debugging output for this CMake project" OFF) option(BUILD_SHARED_LIBS "Build shared libraries" OFF) @@ -229,7 +229,7 @@ endif() # Use external libraries if requested # ===================================== -if(USE_EXTERNAL) +if(USE_EXTERNAL_LIBS) FetchContent_Declare(libelf GIT_REPOSITORY https://github.com/avrdudes/libelf.git GIT_TAG e5a39bf19bd6598c42e09172be5a78ceec2a065c @@ -299,7 +299,7 @@ if (DEBUG_CMAKE) message(STATUS "CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}") message(STATUS "CONFIG_DIR: ${CONFIG_DIR}") message(STATUS "AVRDUDE_FULL_VERSION: ${AVRDUDE_FULL_VERSION}") - message(STATUS "USE_EXTERNAL: ${USE_EXTERNAL}") + message(STATUS "USE_EXTERNAL_LIBS: ${USE_EXTERNAL_LIBS}") message(STATUS "USE_LIBUSBWIN32: ${USE_LIBUSBWIN32}") message(STATUS "HAVE_LIBELF: ${HAVE_LIBELF}") message(STATUS "HAVE_LIBUSB: ${HAVE_LIBUSB}")