-
Notifications
You must be signed in to change notification settings - Fork 62
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[legacy] geant4: Support brewed GL libs on macOS
- Loading branch information
1 parent
0a99a74
commit 13c85f3
Showing
2 changed files
with
44 additions
and
0 deletions.
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
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,39 @@ | ||
commit c4caa66623c7d81d493521d4941498535dc40cd0 | ||
Author: Florian Uhlig <f.uhlig@gsi.de> | ||
Date: Fri Jan 15 11:27:17 2021 +0100 | ||
|
||
Fix installation error with brew GL package | ||
|
||
The brew package manager for macosx supports meanwhile the installation of | ||
x11 and GL and is not longer bound to the usage of the unsupported XQuartz | ||
package. Using the brew packages libx11 and mesa-glu the necessary include | ||
and library files are ínstalled in /usr/local. Unfortunately this directory | ||
is not in the search path such that the configuration of Geant4 fails. | ||
The fix add the the missing search path such that GL installation is found | ||
and the configuration succeeds. | ||
|
||
diff --git a/cmake/Modules/FindXQuartzGL.cmake b/cmake/Modules/FindXQuartzGL.cmake | ||
index c26754a611..335dc88dc2 100644 | ||
--- a/cmake/Modules/FindXQuartzGL.cmake | ||
+++ b/cmake/Modules/FindXQuartzGL.cmake | ||
@@ -49,17 +49,17 @@ set(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK}) | ||
set(CMAKE_FIND_FRAMEWORK NEVER) | ||
|
||
find_path(XQuartzGL_INCLUDE_DIR GL/gl.h | ||
- PATHS /usr/X11R6/include /opt/X11/include | ||
+ PATHS /usr/X11R6/include /opt/X11/include /usr/local/include | ||
NO_DEFAULT_PATH | ||
) | ||
|
||
find_library(XQuartzGL_gl_LIBRARY GL | ||
- PATHS /usr/X11R6/lib /opt/X11/lib | ||
+ PATHS /usr/X11R6/lib /opt/X11/lib /usr/local/lib | ||
NO_DEFAULT_PATH | ||
) | ||
|
||
find_library(XQuartzGL_glu_LIBRARY GLU | ||
- PATHS /usr/X11R6/lib /opt/X11/lib | ||
+ PATHS /usr/X11R6/lib /opt/X11/lib /usr/local/lib | ||
NO_DEFAULT_PATH | ||
) | ||
|