Browse Source

ENH: add more search paths on HPUX

Bill Hoffman 16 years ago
parent
commit
62a634aeba
2 changed files with 13 additions and 0 deletions
  1. 8 0
      Modules/FindOpenGL.cmake
  2. 5 0
      Modules/Platform/HP-UX.cmake

+ 8 - 0
Modules/FindOpenGL.cmake

@@ -45,6 +45,13 @@ ELSE (WIN32)
     FIND_PATH(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OSX")
 
   ELSE(APPLE)
+    # Handle HP-UX cases where we only want to find OpenGL in either hpux64
+    # or hpux32 depending on if we're doing a 64 bit build.
+    IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+      SET(HPUX_IA_OPENGL_LIB_PATH /opt/graphics/OpenGL/lib/hpux32/)
+    ELSE(CMAKE_SIZEOF_VOID_P EQUAL 4)
+      SET(HPUX_IA_OPENGL_LIB_PATH /opt/graphics/OpenGL/lib/hpux64/)
+    ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 4)
 
     # The first line below is to make sure that the proper headers
     # are used on a Linux machine with the NVidia drivers installed.
@@ -71,6 +78,7 @@ ELSE (WIN32)
       PATHS /opt/graphics/OpenGL/lib
             /usr/openwin/lib
             /usr/shlib /usr/X11R6/lib
+            ${HPUX_IA_OPENGL_LIB_PATH}
     )
 
     # On Unix OpenGL most certainly always requires X11.

+ 5 - 0
Modules/Platform/HP-UX.cmake

@@ -89,6 +89,11 @@ ELSE(CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 # set flags for gcc support
 INCLUDE(Platform/UnixPaths)
+IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+  LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /usr/lib/hpux32)
+ELSE(CMAKE_SIZEOF_VOID_P EQUAL 4)
+  LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /usr/lib/hpux64)
+ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 4)
 
 IF(NOT CMAKE_COMPILER_IS_GNUCC)
   SET (CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")