Commit 62a634ae authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: add more search paths on HPUX

parent 3dadbdf3
...@@ -45,6 +45,13 @@ ELSE (WIN32) ...@@ -45,6 +45,13 @@ ELSE (WIN32)
FIND_PATH(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OSX") FIND_PATH(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OSX")
ELSE(APPLE) 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 # The first line below is to make sure that the proper headers
# are used on a Linux machine with the NVidia drivers installed. # are used on a Linux machine with the NVidia drivers installed.
...@@ -71,6 +78,7 @@ ELSE (WIN32) ...@@ -71,6 +78,7 @@ ELSE (WIN32)
PATHS /opt/graphics/OpenGL/lib PATHS /opt/graphics/OpenGL/lib
/usr/openwin/lib /usr/openwin/lib
/usr/shlib /usr/X11R6/lib /usr/shlib /usr/X11R6/lib
${HPUX_IA_OPENGL_LIB_PATH}
) )
# On Unix OpenGL most certainly always requires X11. # On Unix OpenGL most certainly always requires X11.
......
...@@ -89,6 +89,11 @@ ELSE(CMAKE_COMPILER_IS_GNUCXX) ...@@ -89,6 +89,11 @@ ELSE(CMAKE_COMPILER_IS_GNUCXX)
ENDIF(CMAKE_COMPILER_IS_GNUCXX) ENDIF(CMAKE_COMPILER_IS_GNUCXX)
# set flags for gcc support # set flags for gcc support
INCLUDE(Platform/UnixPaths) 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) IF(NOT CMAKE_COMPILER_IS_GNUCC)
SET (CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>") SET (CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment