Revision: 77338
http://sourceforge.net/p/brlcad/code/77338
Author: brlcad
Date: 2020-10-06 03:26:48 +0000 (Tue, 06 Oct 2020)
Log Message:
-----------
this feels wrong given implications, but it does appear to be how this is
coded. this support for arm (raspberry pi) is consistent with the inclusion of
i386-linux-gnu as a search path. this is sf patch #557 X11 and OpenGL detection
on Raspberry Pi (from Anssi Saari and Bob Prohaska)
Modified Paths:
--------------
brlcad/trunk/misc/CMake/FindGL.cmake
brlcad/trunk/misc/CMake/FindX11.cmake
Modified: brlcad/trunk/misc/CMake/FindGL.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindGL.cmake 2020-10-06 01:24:51 UTC (rev
77337)
+++ brlcad/trunk/misc/CMake/FindGL.cmake 2020-10-06 03:26:48 UTC (rev
77338)
@@ -172,7 +172,7 @@
if(SEARCH_64BIT)
set(64BIT_DIRS "/usr/lib64/X11;/usr/lib64;/usr/lib/x86_64-linux-gnu")
else(SEARCH_64BIT)
- set(32BIT_DIRS "/usr/lib/X11;/usr/lib;/usr/lib/i386-linux-gnu")
+ set(32BIT_DIRS
"/usr/lib/X11;/usr/lib;/usr/lib/i386-linux-gnu;/usr/lib/arm-linux-gnueabihf")
endif(SEARCH_64BIT)
set(OPENGL_LIB_SEARCH_PATH
Modified: brlcad/trunk/misc/CMake/FindX11.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindX11.cmake 2020-10-06 01:24:51 UTC (rev
77337)
+++ brlcad/trunk/misc/CMake/FindX11.cmake 2020-10-06 03:26:48 UTC (rev
77338)
@@ -169,7 +169,7 @@
set(64BIT_DIRS ${64BIT_DIRS} /usr/lib/X11 /usr/lib)
endif(EXISTS "/usr/lib32" OR NOT EXISTS "/usr/lib64")
else(SEARCH_64BIT)
- set(32BIT_DIRS "/usr/lib32/X11;/usr/lib32;/usr/lib/i386-linux-gnu")
+ set(32BIT_DIRS
"/usr/lib32/X11;/usr/lib32;/usr/lib/i386-linux-gnu;/usr/lib/arm-linux-gnueabihf")
if(EXISTS "/usr/lib64" OR NOT EXISTS "/usr/lib32")
set(32BIT_DIRS ${32BIT_DIRS} /usr/lib/X11 /usr/lib)
endif(EXISTS "/usr/lib64" OR NOT EXISTS "/usr/lib32")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
