40 lines
1.1 KiB
Plaintext
40 lines
1.1 KiB
Plaintext
From 3d7f45b060924521b13a80acd670fc32fbeabc28 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Wed, 10 Nov 2021 18:21:03 +1000
|
|
Subject: Fixes for Haiku
|
|
|
|
|
|
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
|
|
index 58ba80a..fe98397 100644
|
|
--- a/external/CMakeLists.txt
|
|
+++ b/external/CMakeLists.txt
|
|
@@ -37,7 +37,7 @@ if (add_hunspell_library)
|
|
add_checked_subdirectory(hunspell)
|
|
endif()
|
|
add_checked_subdirectory(iconv)
|
|
-if (LINUX)
|
|
+if (LINUX AND NOT HAIKU)
|
|
add_checked_subdirectory(jemalloc)
|
|
endif()
|
|
add_checked_subdirectory(jpeg)
|
|
diff --git a/options_linux.cmake b/options_linux.cmake
|
|
index 2797c7b..26368f2 100644
|
|
--- a/options_linux.cmake
|
|
+++ b/options_linux.cmake
|
|
@@ -45,10 +45,12 @@ if (DESKTOP_APP_SPECIAL_TARGET)
|
|
target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)
|
|
endif()
|
|
|
|
+if (NOT HAIKU)
|
|
target_link_libraries(common_options
|
|
INTERFACE
|
|
desktop-app::external_jemalloc
|
|
)
|
|
+endif()
|
|
|
|
if (DESKTOP_APP_USE_ALLOCATION_TRACER)
|
|
target_link_options(common_options
|
|
--
|
|
2.30.2
|
|
|