Update patches for cmake 2.8.11 and 2.8-git to include some of our changes that are not merged yet.

This commit is contained in:
Adrien Destugues
2013-07-27 16:11:19 +02:00
parent 725e6e5eae
commit d2acf18c1e
2 changed files with 48 additions and 16 deletions

View File

@@ -1,3 +1,15 @@
diff -urN cmake-2.8.10.2-orig/Modules/FindLua51.cmake cmake-2.8.10.2/Modules/FindLua51.cmake
--- cmake-2.8-git-orig/Modules/FindLua51.cmake 2012-11-27 05:26:32.033030144 -0800
+++ cmake-2.8-git/Modules/FindLua51.cmake 2012-12-03 12:02:17.644612096 -0800
@@ -54,7 +54,7 @@
if(LUA_LIBRARY)
# include the math library for Unix
- if(UNIX AND NOT APPLE AND NOT BEOS)
+ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
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
diff -urN cmake-2.8-git-orig/Modules/Platform/Haiku.cmake cmake-2.8-git/Modules/Platform/Haiku.cmake
--- cmake-2.8-git-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800
+++ cmake-2.8-git/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800