mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 00:30:06 +02:00
48 lines
1.4 KiB
Plaintext
48 lines
1.4 KiB
Plaintext
From 3ad4249e4222d11b2a919e8174a3de01c147f97c Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Wed, 4 Jun 2014 17:26:56 +0000
|
|
Subject: haiku patch
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 354ca75..cc1fef7 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -207,13 +207,9 @@ set(
|
|
)
|
|
|
|
# install header files
|
|
-install(FILES ${haru_HDRS} DESTINATION include)
|
|
+install(FILES ${haru_HDRS} DESTINATION "develop/headers")
|
|
|
|
# install various files
|
|
-install(FILES README CHANGES INSTALL DESTINATION .)
|
|
-if(NOT DEVPAK)
|
|
- install(DIRECTORY if DESTINATION .)
|
|
-endif(NOT DEVPAK)
|
|
if(DEVPAK)
|
|
install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .)
|
|
endif(DEVPAK)
|
|
diff --git a/cmake/modules/haru.cmake b/cmake/modules/haru.cmake
|
|
index 95647b9..0495d6c 100644
|
|
--- a/cmake/modules/haru.cmake
|
|
+++ b/cmake/modules/haru.cmake
|
|
@@ -27,11 +27,11 @@ check_include_files(unistd.h LIBHPDF_HAVE_UNISTD_H)
|
|
# =======================================================================
|
|
# On windows systems the math library is not separated so do not specify
|
|
# it unless you are on a non-windows system.
|
|
-if(NOT WIN32)
|
|
+if(NOT WIN32 AND NOT HAIKU)
|
|
find_library(MATH_LIB NAMES m PATHS /usr/local/lib /usr/lib)
|
|
if(NOT MATH_LIB)
|
|
message(FATAL_ERROR "Cannot find required math library")
|
|
endif(NOT MATH_LIB)
|
|
-else(NOT WIN32)
|
|
+else(NOT WIN32 AND NOT HAIKU)
|
|
set(MATH_LIB)
|
|
-endif(NOT WIN32)
|
|
+endif(NOT WIN32 AND NOT HAIKU)
|
|
--
|
|
1.8.3.4
|
|
|