mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
48 lines
1.3 KiB
Plaintext
48 lines
1.3 KiB
Plaintext
From f01e1bbc58fc3cc5296683d99c1f0694e2a98b91 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Tue, 12 Dec 2017 10:28:32 +0100
|
|
Subject: Haiku got no -lrt
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index ae70f2d..7ce146e 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -121,7 +121,7 @@ if(BUILD_WITH_COVERAGE)
|
|
endif()
|
|
|
|
# For clock_gettime().
|
|
-if (UNIX AND NOT APPLE)
|
|
+if (UNIX AND NOT APPLE AND NOT HAIKU)
|
|
set(MLPACK_LIBRARIES ${MLPACK_LIBRARIES} "rt")
|
|
endif ()
|
|
|
|
--
|
|
2.15.0
|
|
|
|
|
|
From 63633d4a75303673cf11cb71f182540817d4989a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Sat, 23 Dec 2017 22:38:05 +0100
|
|
Subject: PC file fix. (already upstreamed)
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 7ce146e..2d11b73 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -509,8 +509,8 @@ if (PKG_CONFIG_FOUND)
|
|
foreach (incldir ${MLPACK_INCLUDE_DIRS})
|
|
# Filter out some obviously unnecessary directories.
|
|
if (NOT "${incldir}" STREQUAL "/usr/include")
|
|
- set(MLPACK_INCLUDE_DIRS_STRING "${MLPACK_INCLUDE_DIRS_STRING}
|
|
- -I${incldir}")
|
|
+ set(MLPACK_INCLUDE_DIRS_STRING
|
|
+ "${MLPACK_INCLUDE_DIRS_STRING} -I${incldir}")
|
|
endif ()
|
|
endforeach ()
|
|
# Add the install directory too.
|
|
--
|
|
2.15.0
|
|
|