[brlcad-commits] SF.net SVN: brlcad:[50388] brlcad/trunk/misc/CMake/FindX11.cmake

[<sta...@us...>]

Revision: 50388
          http://brlcad.svn.sourceforge.net/brlcad/?rev=50388&view=rev
Author:   starseeker
Date:     2012-05-01 21:11:21 +0000 (Tue, 01 May 2012)
Log Message:
-----------
If we don't have multilib systems, assume /usr/lib is legit for the word size specified

Modified Paths:
--------------
    brlcad/trunk/misc/CMake/FindX11.cmake

Modified: brlcad/trunk/misc/CMake/FindX11.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindX11.cmake	2012-05-01 19:52:00 UTC (rev 50387)
+++ brlcad/trunk/misc/CMake/FindX11.cmake	2012-05-01 21:11:21 UTC (rev 50388)
@@ -168,11 +168,21 @@
     if(EXISTS "/usr/lib32")
       set(64BIT_DIRS ${64BIT_DIRS} /usr/lib/X11 /usr/lib)
     endif(EXISTS "/usr/lib32")
+    # If there are no explicit word size lib dirs, assume we want to
+    # check /usr/lib
+    if(NOT EXISTS "/usr/lib32" AND NOT EXISTS "/usr/lib64")
+      set(64BIT_DIRS ${64BIT_DIRS} /usr/lib)
+    endif(NOT EXISTS "/usr/lib32" AND NOT EXISTS "/usr/lib64")
   else(SEARCH_64BIT)
     set(32BIT_DIRS "/usr/lib32/X11;/usr/lib32;/usr/lib/i386-linux-gnu")
     if(EXISTS "/usr/lib64")
       set(32BIT_DIRS ${32BIT_DIRS} /usr/lib/X11 /usr/lib)
     endif(EXISTS "/usr/lib64")
+    # If there are no explicit word size lib dirs, assume we want to
+    # check /usr/lib
+    if(NOT EXISTS "/usr/lib32" AND NOT EXISTS "/usr/lib64")
+      set(32BIT_DIRS ${32BIT_DIRS} /usr/lib)
+    endif(NOT EXISTS "/usr/lib32" AND NOT EXISTS "/usr/lib64")
   endif(SEARCH_64BIT)
 
   # Candidate directories for headers

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.