diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-06-15 16:39:12 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-06-15 16:39:12 (GMT) |
| commit | 62a634aeba0104fa4e62f001bd53587486ed3732 (patch) | |
| tree | 2d8413decb9e99bb9932bd256e7c6ea8a3ea98e5 | |
| parent | 3dadbdf3fdb6172713990459b648deae44bfa161 (diff) | |
| download | CMake-62a634aeba0104fa4e62f001bd53587486ed3732.zip CMake-62a634aeba0104fa4e62f001bd53587486ed3732.tar.gz CMake-62a634aeba0104fa4e62f001bd53587486ed3732.tar.bz2 | |
ENH: add more search paths on HPUX
| -rw-r--r-- | Modules/FindOpenGL.cmake | 8 | ||||
| -rw-r--r-- | Modules/Platform/HP-UX.cmake | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake index 1c2648a..2e289c2 100644 --- a/Modules/FindOpenGL.cmake +++ b/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. diff --git a/Modules/Platform/HP-UX.cmake b/Modules/Platform/HP-UX.cmake index 9191cef..41f721e 100644 --- a/Modules/Platform/HP-UX.cmake +++ b/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>") |