[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1464-g7e91a0f
Rolf Eike Beer
eike at sf-mail.de
Mon Jan 7 18:43:02 EST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 7e91a0f4baa905b8d8c635616bb8d89d18ee23c1 (commit)
via 0380f36cd8dbdf7a89f8fac91d99235e75075bde (commit)
via 8e9630c719f59f69f813e3eb4a4f91ba2396b4ef (commit)
via 50bfedf391a078e628bf1259f819da42dea1cde0 (commit)
from 2c7d8849db2025dfd189f16771d8c6c5ff043cfc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e91a0f4baa905b8d8c635616bb8d89d18ee23c1
commit 7e91a0f4baa905b8d8c635616bb8d89d18ee23c1
Merge: 2c7d884 0380f36
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 7 18:42:58 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 7 18:42:58 2013 -0500
Merge topic 'Haiku' into next
0380f36 FindOpenGL: add Haiku paths
8e9630c FindGLUT: BeOS does not have libXi and libXmu
50bfedf FindLua51: do not try to link libm on BeOS
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0380f36cd8dbdf7a89f8fac91d99235e75075bde
commit 0380f36cd8dbdf7a89f8fac91d99235e75075bde
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 8 00:38:08 2013 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jan 8 00:39:53 2013 +0100
FindOpenGL: add Haiku paths
Also check the HP-UX specific paths only when on HP-UX.
diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
index 4a393f2..96c4d8d 100644
--- a/Modules/FindOpenGL.cmake
+++ b/Modules/FindOpenGL.cmake
@@ -58,14 +58,22 @@ else ()
find_path(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OSX")
else()
- # 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()
- set(HPUX_IA_OPENGL_LIB_PATH
- /opt/graphics/OpenGL/lib/hpux64/
- /opt/graphics/OpenGL/lib/pa20_64)
+ if (CMAKE_SYSTEM_NAME MATCHES "HP-UX")
+ # 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(_OPENGL_LIB_PATH
+ /opt/graphics/OpenGL/lib/hpux32/)
+ else()
+ set(_OPENGL_LIB_PATH
+ /opt/graphics/OpenGL/lib/hpux64/
+ /opt/graphics/OpenGL/lib/pa20_64)
+ endif()
+ elseif(CMAKE_SYSTEM_NAME STREQUAL Haiku)
+ set(_OPENGL_LIB_PATH
+ /boot/develop/lib/x86)
+ set(_OPENGL_INCLUDE_PATH
+ /boot/develop/headers/os/opengl)
endif()
# The first line below is to make sure that the proper headers
@@ -80,6 +88,7 @@ else ()
/usr/share/doc/NVIDIA_GLX-1.0/include
/usr/openwin/share/include
/opt/graphics/OpenGL/include /usr/X11R6/include
+ ${_OPENGL_INCLUDE_PATH}
)
find_path(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
@@ -93,9 +102,12 @@ else ()
PATHS /opt/graphics/OpenGL/lib
/usr/openwin/lib
/usr/shlib /usr/X11R6/lib
- ${HPUX_IA_OPENGL_LIB_PATH}
+ ${_OPENGL_LIB_PATH}
)
+ unset(_OPENGL_INCLUDE_PATH)
+ unset(_OPENGL_LIB_PATH)
+
# On Unix OpenGL most certainly always requires X11.
# Feel free to tighten up these conditions if you don't
# think this is always true.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e9630c719f59f69f813e3eb4a4f91ba2396b4ef
commit 8e9630c719f59f69f813e3eb4a4f91ba2396b4ef
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 7 23:57:07 2013 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 7 23:57:07 2013 +0100
FindGLUT: BeOS does not have libXi and libXmu
diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake
index 55790ae..843d138 100644
--- a/Modules/FindGLUT.cmake
+++ b/Modules/FindGLUT.cmake
@@ -40,25 +40,39 @@ else ()
set(GLUT_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
else ()
+ if (BEOS)
+
+ set(_GLUT_INC_DIR /boot/develop/headers/os/opengl)
+ set(_GLUT_glut_LIB_DIR /boot/develop/lib/x86)
+
+ else()
+
+ find_library( GLUT_Xi_LIBRARY Xi
+ /usr/openwin/lib
+ )
+
+ find_library( GLUT_Xmu_LIBRARY Xmu
+ /usr/openwin/lib
+ )
+
+ endif ()
+
find_path( GLUT_INCLUDE_DIR GL/glut.h
/usr/include/GL
/usr/openwin/share/include
/usr/openwin/include
/opt/graphics/OpenGL/include
/opt/graphics/OpenGL/contrib/libglut
+ ${_GLUT_INC_DIR}
)
find_library( GLUT_glut_LIBRARY glut
/usr/openwin/lib
+ ${_GLUT_glut_LIB_DIR}
)
- find_library( GLUT_Xi_LIBRARY Xi
- /usr/openwin/lib
- )
-
- find_library( GLUT_Xmu_LIBRARY Xmu
- /usr/openwin/lib
- )
+ unset(_GLUT_INC_DIR)
+ unset(_GLUT_glut_LIB_DIR)
endif ()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50bfedf391a078e628bf1259f819da42dea1cde0
commit 50bfedf391a078e628bf1259f819da42dea1cde0
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 7 23:26:18 2013 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 7 23:26:18 2013 +0100
FindLua51: do not try to link libm on BeOS
This includes Haiku, which currently is treated as BeOS. The ComplexOneConfig
test already knew about this.
diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake
index 2d7ed3d..a2bf0c0 100644
--- a/Modules/FindLua51.cmake
+++ b/Modules/FindLua51.cmake
@@ -54,7 +54,7 @@ find_library(LUA_LIBRARY
if(LUA_LIBRARY)
# include the math library for Unix
- if(UNIX AND NOT APPLE)
+ if(UNIX AND NOT APPLE AND NOT BEOS)
find_library(LUA_MATH_LIBRARY m)
set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
# For Windows and Mac, don't need to explicitly include the math library
-----------------------------------------------------------------------
Summary of changes:
Modules/FindGLUT.cmake | 28 +++++++++++++++++++++-------
Modules/FindLua51.cmake | 2 +-
Modules/FindOpenGL.cmake | 30 +++++++++++++++++++++---------
3 files changed, 43 insertions(+), 17 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list