From b244583d341fc8e9d1c2898f7c545dca6aa366e6 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 30 Aug 2019 21:22:17 +0200 Subject: [PATCH] CMake: Rename USE_GETRANDOM to EXPAT_WITH_GETRANDOM --- expat/CMakeLists.txt | 4 ++-- expat/Changes | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index 55157e7e..272bf411 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -55,7 +55,7 @@ option(XML_NS "Define to make XML Namespaces functionality available" ON) option(EXPAT_WARNINGS_AS_ERRORS "Treat all compiler warnings as errors" OFF) if(NOT WIN32) option(XML_DEV_URANDOM "Define to include code reading entropy from `/dev/urandom'." ON) - set(USE_GETRANDOM "AUTO" CACHE STRING + set(EXPAT_WITH_GETRANDOM "AUTO" CACHE STRING "Make use of getrandom function (ON|OFF|AUTO) [default=AUTO]") set(USE_SYS_GETRANDOM "AUTO" CACHE STRING "Make use of syscall SYS_getrandom (ON|OFF|AUTO) [default=AUTO]") @@ -135,7 +135,7 @@ macro(evaluate_detection_results use_ref have_ref thing_lower thing_title) endmacro() if(NOT WIN32) - evaluate_detection_results(USE_GETRANDOM HAVE_GETRANDOM "function getrandom" "Function getrandom") + evaluate_detection_results(EXPAT_WITH_GETRANDOM HAVE_GETRANDOM "function getrandom" "Function getrandom") evaluate_detection_results(USE_SYS_GETRANDOM HAVE_SYSCALL_GETRANDOM "syscall SYS_getrandom" "Syscall SYS_getrandom") endif() diff --git a/expat/Changes b/expat/Changes index fca4efc5..4999b293 100644 --- a/expat/Changes +++ b/expat/Changes @@ -27,7 +27,7 @@ Release x.x.x xxx xxx xx xxxx #326 CMake: Add argument -DXML_LARGE_SIZE=(ON|OFF), default OFF #326 CMake: Add argument -DXML_MIN_SIZE=(ON|OFF), default OFF #239 #277 CMake: Add arguments - -DUSE_GETRANDOM=(ON|OFF|AUTO), default AUTO + -DEXPAT_WITH_GETRANDOM=(ON|OFF|AUTO), default AUTO -DUSE_SYS_GETRANDOM=(ON|OFF|AUTO), default AUTO #326 CMake: Install expat_config.h to include directory #326 CMake: Generate and install configuration files for