mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-14 15:50:07 +02:00
88 lines
3.0 KiB
Plaintext
88 lines
3.0 KiB
Plaintext
From 4a5216f4de8210d35c9fa236efb8bf851e8b6d44 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com.org>
|
|
Date: Mon, 18 Jun 2018 00:44:49 +1000
|
|
Subject: Fix build for Haiku
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 0bad0d7..3195310 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -166,7 +166,7 @@ install(FILES ${CMAKE_BINARY_DIR}/libftdi1.pc ${CMAKE_BINARY_DIR}/libftdipp1.pc
|
|
if ( UNIX )
|
|
configure_file ( libftdi1-config.in ${CMAKE_CURRENT_BINARY_DIR}/libftdi1-config @ONLY )
|
|
install ( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libftdi1-config
|
|
- DESTINATION bin )
|
|
+ DESTINATION bin${BIN_SUFFIX} )
|
|
|
|
# config script install path
|
|
if ( NOT DEFINED LIBFTDI_CMAKE_CONFIG_DIR )
|
|
diff --git a/ftdi_eeprom/CMakeLists.txt b/ftdi_eeprom/CMakeLists.txt
|
|
index a843b8e..ca438e5 100644
|
|
--- a/ftdi_eeprom/CMakeLists.txt
|
|
+++ b/ftdi_eeprom/CMakeLists.txt
|
|
@@ -28,9 +28,9 @@ if (FTDI_EEPROM)
|
|
|
|
add_executable(ftdi_eeprom main.c)
|
|
target_link_libraries(ftdi_eeprom ftdi1)
|
|
- target_link_libraries(ftdi_eeprom ${Confuse_LIBRARIES})
|
|
+ target_link_libraries(ftdi_eeprom ${Confuse_LIBRARIES} ${LIBUSB})
|
|
|
|
- install(TARGETS ftdi_eeprom DESTINATION bin)
|
|
+ install(TARGETS ftdi_eeprom DESTINATION bin${BIN_SUFFIX})
|
|
|
|
else(Confuse_FOUND)
|
|
message(STATUS "libConfuse not found, won't build ftdi_eeprom")
|
|
diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt
|
|
index 16184ee..2563cd8 100644
|
|
--- a/ftdipp/CMakeLists.txt
|
|
+++ b/ftdipp/CMakeLists.txt
|
|
@@ -51,7 +51,7 @@ if (FTDIPP)
|
|
COMPONENT staticlibs
|
|
)
|
|
install( FILES ${cpp_headers}
|
|
- DESTINATION include/${PROJECT_NAME}
|
|
+ DESTINATION develop/headers${INC_SUFFIX}/${PROJECT_NAME}
|
|
COMPONENT headers
|
|
)
|
|
endif(${UNIX})
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 1f39ee7..f074b30 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -51,7 +51,7 @@ if(${UNIX})
|
|
)
|
|
|
|
install( FILES ${c_headers}
|
|
- DESTINATION include/${PROJECT_NAME}
|
|
+ DESTINATION develop/headers${INC_SUFFIX}/${PROJECT_NAME}
|
|
COMPONENT headers
|
|
)
|
|
|
|
--
|
|
2.16.4
|
|
|
|
|
|
From 26f5ce99b2eea24a772307de16f1fd221e992271 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Mon, 18 Jun 2018 00:51:51 +1000
|
|
Subject: Fix build for x86_64 arch
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 3195310..0c45883 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -47,7 +47,7 @@ set(CPACK_COMPONENT_STATICLIBS_GROUP "Development")
|
|
set(CPACK_COMPONENT_HEADERS_GROUP "Development")
|
|
|
|
# automatically set lib suffix
|
|
-if ( UNIX AND NOT APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_version" )
|
|
+if ( UNIX AND NOT APPLE AND NOT HAIKU AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_version" )
|
|
if ( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT LIB_SUFFIX )
|
|
set ( LIB_SUFFIX 64 )
|
|
endif ()
|
|
--
|
|
2.16.4
|
|
|