haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Fix finding libraries

Browse Source 
Set CMAKE_SYSTEM_LIBRARY_PATH in Haiku.cmake by default after all.
CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES doesn't really seem to be
used.
This commit is contained in:
Ingo Weinhold
2013-05-20 18:11:03 +02:00
parent 2b1ceca619
commit 3315657fae
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-util/cmake/cmake-2.8.5.recipe
View File

@@ -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"

14
dev-util/cmake/patches/cmake-2.8.5.patch
View File

@@ -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