From 3315657faeb012db9ec7b0e74bd140551e0c85ca Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 20 May 2013 18:11:03 +0200
Subject: [PATCH] cmake: Fix finding libraries

Set CMAKE_SYSTEM_LIBRARY_PATH in Haiku.cmake by default after all.
CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES doesn't really seem to be
used.
---
 dev-util/cmake/cmake-2.8.5.recipe        |  2 +-
 dev-util/cmake/patches/cmake-2.8.5.patch | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe
index cd8943eec..3ae91f976 100644
--- a/dev-util/cmake/cmake-2.8.5.recipe
+++ b/dev-util/cmake/cmake-2.8.5.recipe
@@ -5,7 +5,7 @@ LICENSE="CMake"
 COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved."
 SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz"
 CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PATCHES="cmake-2.8.5.patch"
diff --git a/dev-util/cmake/patches/cmake-2.8.5.patch b/dev-util/cmake/patches/cmake-2.8.5.patch
index b1b016368..ab49e2913 100644
--- a/dev-util/cmake/patches/cmake-2.8.5.patch
+++ b/dev-util/cmake/patches/cmake-2.8.5.patch
@@ -171,9 +171,9 @@ diff -ur orig/cmake-2.8.5/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenG
  
      FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
 diff -ur orig/cmake-2.8.5/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake
---- orig/cmake-2.8.5/Modules/Platform/Haiku.cmake	2011-07-08 14:21:44.058458112 +0200
-+++ cmake-2.8.5/Modules/Platform/Haiku.cmake	2013-04-28 15:57:05.984875008 +0200
-@@ -1,20 +1,82 @@
+--- orig/cmake-2.8.5/Modules/Platform/Haiku.cmake	2011-07-08 14:21:44.013107200 +0200
++++ cmake-2.8.5/Modules/Platform/Haiku.cmake	2013-05-20 17:09:28.999292928 +0200
+@@ -1,20 +1,88 @@
 -SET(BEOS 1)
 +SET(HAIKU 1)
 +SET(UNIX 1)
@@ -259,11 +259,17 @@ diff -ur orig/cmake-2.8.5/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf
 +
 +LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES})
 +
-+LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
++LIST(APPEND CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES
 +  /boot/common/non-packaged/develop/lib
 +  /boot/common/develop/lib
 +  /boot/system/develop/lib
 +  )
++
++LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
++  ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES}
++  )
++
++LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES})
  
  IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
    SET(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH