diff options
Diffstat (limited to 'sci-physics/root/files/root-6.12.06-disable-ftgl.patch')
-rw-r--r-- | sci-physics/root/files/root-6.12.06-disable-ftgl.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/sci-physics/root/files/root-6.12.06-disable-ftgl.patch b/sci-physics/root/files/root-6.12.06-disable-ftgl.patch new file mode 100644 index 000000000000..89d8d550d300 --- /dev/null +++ b/sci-physics/root/files/root-6.12.06-disable-ftgl.patch @@ -0,0 +1,45 @@ +Forwarded: https://sft.its.cern.ch/jira/browse/ROOT-9315 + +Index: root-6.12.06/cmake/modules/SearchInstalledSoftware.cmake +=================================================================== +--- root-6.12.06.orig/cmake/modules/SearchInstalledSoftware.cmake ++++ root-6.12.06/cmake/modules/SearchInstalledSoftware.cmake +@@ -1075,22 +1075,24 @@ if(globus) + endif() + + #---Check for ftgl if needed---------------------------------------------------------- +-if(NOT builtin_ftgl) +- find_package(FTGL) +- if(NOT FTGL_FOUND) +- if(fail-on-missing) +- message(FATAL_ERROR "ftgl library not found and is required ('builtin_ftgl' is OFF). Set varible FTGL_ROOT_DIR to installation location") +- else() +- message(STATUS "ftgl library not found. Set variable FTGL_ROOT_DIR to point to your installation") +- message(STATUS "For the time being switching ON 'builtin_ftgl' option") +- set(builtin_ftgl ON CACHE BOOL "" FORCE) ++if(buildgl) ++ if(NOT builtin_ftgl) ++ find_package(FTGL) ++ if(NOT FTGL_FOUND) ++ if(fail-on-missing) ++ message(FATAL_ERROR "ftgl library not found and is required ('builtin_ftgl' is OFF). Set varible FTGL_ROOT_DIR to installation location") ++ else() ++ message(STATUS "ftgl library not found. Set variable FTGL_ROOT_DIR to point to your installation") ++ message(STATUS "For the time being switching ON 'builtin_ftgl' option") ++ set(builtin_ftgl ON CACHE BOOL "" FORCE) ++ endif() + endif() + endif() +-endif() +-if(builtin_ftgl) +- set(FTGL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/graf3d/ftgl/inc) +- set(FTGL_CFLAGS -DBUILTIN_FTGL) +- set(FTGL_LIBRARIES FTGL) ++ if(builtin_ftgl) ++ set(FTGL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/graf3d/ftgl/inc) ++ set(FTGL_CFLAGS -DBUILTIN_FTGL) ++ set(FTGL_LIBRARIES FTGL) ++ endif() + endif() + + #---Check for chirp-------------------------------------------------------------------- |