forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sci-physics/root: have root6 compile on Prefix.
1. DEFAULT_SYSROOT of bundled llvm points to EPREFIX, so that system headers inside EPREFIX is used. 2. prefixify the CMakeList system headers copies. 3. disable ftgl search when USE=opengl is not set. Package-Manager: Portage-2.3.24, Repoman-2.3.6
- Loading branch information
Showing
2 changed files
with
50 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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-------------------------------------------------------------------- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters