mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-13 07:10:05 +02:00
aae3cd421b
* Updated Android File Transfer to version 4.2 * Bumped to latest git version (renamed as 4.3), some fixes in the recipe/patchset * Added OpenSSL requirement to build with MTPZ support. * Dropped libusb requirement and changed cmake option accordingly since now we're using Haiku's native backend * Fixed a CMakeLists.txt that was using an unset variable when Readline was not detected (should that go upstream?)
29 lines
882 B
Plaintext
29 lines
882 B
Plaintext
From ea6462037c6bfa69496b3a35173a6d09e8347e7a Mon Sep 17 00:00:00 2001
|
|
From: Javier Steinaker <jsteinaker@gmail.com>
|
|
Date: Sat, 3 Sep 2022 09:12:54 +1000
|
|
Subject: Fix build: readline env variables should only be used when readline
|
|
is detected
|
|
|
|
|
|
diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
|
|
index b82248c..dd75599 100644
|
|
--- a/cli/CMakeLists.txt
|
|
+++ b/cli/CMakeLists.txt
|
|
@@ -49,7 +49,12 @@ else()
|
|
endif()
|
|
|
|
add_executable(aft-mtp-cli ${CLI_SOURCES})
|
|
-target_include_directories(aft-mtp-cli SYSTEM PRIVATE ${Readline_INCLUDE_DIR})
|
|
+if (READLINE_FOUND)
|
|
+ target_include_directories(aft-mtp-cli SYSTEM PRIVATE ${Readline_INCLUDE_DIR})
|
|
+else()
|
|
+ target_include_directories(aft-mtp-cli SYSTEM PRIVATE)
|
|
+endif()
|
|
+
|
|
target_link_libraries(aft-mtp-cli ${MTP_LIBRARIES} ${CLI_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
|
install(TARGETS aft-mtp-cli RUNTIME DESTINATION bin)
|
|
|
|
--
|
|
2.36.1
|
|
|