From b487626bc73718d24f7aa45ff9905afee602df9a Mon Sep 17 00:00:00 2001 From: Guilherme Amadio <amadio@cern.ch> Date: Mon, 7 May 2018 10:42:54 +0200 Subject: [PATCH] Revert "Do not enable builtin_unuran if unuran=OFF or fail-on-missing=ON" This reverts commit b9716e446b2f2221d6699e033764e870089d84ef. --- cmake/modules/SearchInstalledSoftware.cmake | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake index 9d9d9c269cf..e8ae34c7953 100644 --- a/cmake/modules/SearchInstalledSoftware.cmake +++ b/cmake/modules/SearchInstalledSoftware.cmake @@ -52,16 +52,12 @@ if(builtin_zlib) endif() #---Check for Unuran ------------------------------------------------------------------ -if(unuran AND NOT builtin_unuran) +if(NOT builtin_unuran) message(STATUS "Looking for Unuran") - if(fail-on-missing) - find_package(Unuran REQUIRED) - else() - find_package(Unuran) - if(NOT UNURAN_FOUND) - message(STATUS "Unuran not found. Switching on builtin_unuran option") - set(builtin_unuran ON CACHE BOOL "" FORCE) - endif() + find_Package(Unuran) + if(NOT UNURAN_FOUND) + message(STATUS "Unuran not found. Switching on builtin_unuran option") + set(builtin_unuran ON CACHE BOOL "" FORCE) endif() endif() -- GitLab