1b2817ee0a
* root: new versions, variants and patches to bring in to line with FNAL's use.
* Support MySQL.
* Patches:
* Bigger stringbuf.
* Find MySQL even when it's called mariadb-c-client.
* Honor external provision of unuran.
* Properly handle the ROOT7 web GUI for 6.16/00.
* `memstat` variant is now default-OFF due to version-related constraints.
* Add missing dependencies.
* Propagate `python` to `libxml2`.
* Handle external FTGL dependency with X / OpenGL: depends on PR ####
* Force `SPACK_INCLUDE_DIRS` to avoid warning.
* New `gminimal` variant default ON per discussion with Javier Cervantes.
* Style fixes per flake8.
* Remove redundant `PATH_SUFFIX` per https://github.com/root-project/root/pull/1993#discussion_r276840329
* Comment patches per https://github.com/spack/spack/pull/11215#discussion_r276887199.
* Reflect the fact that MariaDB support patch is now upstream.
* Restore ncurses dependency for libtinfo.
27 lines
863 B
Diff
27 lines
863 B
Diff
From 20be628aeb0e2548693966b560fdde3e8d19c2d0 Mon Sep 17 00:00:00 2001
|
|
From: Guilherme Amadio <amadio@cern.ch>
|
|
Date: Tue, 8 May 2018 15:12:55 +0200
|
|
Subject: [PATCH] Do not search for unuran or enable builtin_unuran if
|
|
unuran=OFF
|
|
|
|
---
|
|
cmake/modules/SearchInstalledSoftware.cmake | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
|
|
index f69158e..b47ba34 100644
|
|
--- a/cmake/modules/SearchInstalledSoftware.cmake
|
|
+++ b/cmake/modules/SearchInstalledSoftware.cmake
|
|
@@ -60,7 +60,7 @@ if(builtin_zlib)
|
|
endif()
|
|
|
|
#---Check for Unuran ------------------------------------------------------------------
|
|
-if(NOT builtin_unuran)
|
|
+if(unuran AND NOT builtin_unuran)
|
|
message(STATUS "Looking for Unuran")
|
|
find_Package(Unuran)
|
|
if(NOT UNURAN_FOUND)
|
|
--
|
|
1.8.3.1
|
|
|