mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
47 lines
1.4 KiB
Plaintext
47 lines
1.4 KiB
Plaintext
From 6ba0cb9d62c75e6db7ca5d8aa63912ff08a19411 Mon Sep 17 00:00:00 2001
|
|
From: Luc Schrijvers <begasus@gmail.com>
|
|
Date: Wed, 26 Mar 2025 17:29:18 +0100
|
|
Subject: We don't do -ldl
|
|
|
|
|
|
diff --git a/src/KSeExpr/CMakeLists.txt b/src/KSeExpr/CMakeLists.txt
|
|
index 27549b8..2727f80 100644
|
|
--- a/src/KSeExpr/CMakeLists.txt
|
|
+++ b/src/KSeExpr/CMakeLists.txt
|
|
@@ -82,7 +82,9 @@ if (NOT WIN32)
|
|
if (NOT APPLE)
|
|
set_source_files_properties(interpreter.cpp PROPERTIES COMPILE_OPTIONS "-rdynamic")
|
|
endif()
|
|
+ if (NOT HAIKU)
|
|
target_link_libraries(KSeExpr "dl")
|
|
+ endif()
|
|
else()
|
|
add_library(KSeExpr STATIC ${KSeExpr_SOURCES} ${parser_cpp})
|
|
endif()
|
|
--
|
|
2.48.1
|
|
|
|
|
|
From 3196285ec01406ba46837afe465092bccb7193b5 Mon Sep 17 00:00:00 2001
|
|
From: Luc Schrijvers <begasus@gmail.com>
|
|
Date: Wed, 26 Mar 2025 17:50:34 +0100
|
|
Subject: Fix install path for pkgconfig file
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 9fe14b8..514e927 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -261,7 +261,7 @@ endif()
|
|
# all exported targets are found by export() below.
|
|
configure_file("cmake/kseexpr.pc.in" "kseexpr.pc" @ONLY)
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kseexpr.pc"
|
|
- COMPONENT devel DESTINATION share/pkgconfig)
|
|
+ COMPONENT devel DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
|
|
|
write_basic_package_version_file("kseexpr-config-version.cmake" VERSION ${${PROJECT_NAME}_VERSION} COMPATIBILITY SameMajorVersion)
|
|
|
|
--
|
|
2.48.1
|
|
|