From 27f66ae3f60764d8cda698887cc331f687013686 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sat, 23 Mar 2024 19:05:25 -0600 Subject: disable dbus & fix install rules for Haiku diff --git a/pack/CMakeLists.txt b/pack/CMakeLists.txt index c9b5f4d..adbbbb2 100644 --- a/pack/CMakeLists.txt +++ b/pack/CMakeLists.txt @@ -130,7 +130,7 @@ elseif(NOT USE_SYSTEM_QT) endif() # Install XcbQpa library. -if(UNIX AND NOT APPLE) +if(UNIX AND NOT APPLE AND NOT HAIKU) set(LIB_NAME libQt5XcbQpa) get_target_property(QT_CORE_LIBRARY Qt5::Core LOCATION) get_filename_component(LIB_PATH ${QT_CORE_LIBRARY} PATH) @@ -152,7 +152,7 @@ if(UNIX AND NOT APPLE) endif() # Install SSL libraries. -if(NOT APPLE) +if(NOT APPLE AND NOT HAIKU) if(NOT USE_SYSTEM_OPENSSL) if(WIN32) if(CMAKE_SIZEOF_VOID_P EQUAL 8) @@ -199,7 +199,7 @@ if(NOT APPLE) endif() endif() -if(UNIX AND NOT APPLE) +if(UNIX AND NOT APPLE AND NOT HAIKU) foreach(icon 16 32 64 128 256 512) install( FILES ${RSRC_DIR}/Gittyup.iconset/icon_${icon}x${icon}.png diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 82bdc33..f6364ef 100755 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -78,7 +78,7 @@ target_link_libraries( set_target_properties(app PROPERTIES AUTOMOC ON) -if(UNIX AND NOT APPLE) +if(UNIX AND NOT APPLE AND NOT HAIKU) target_link_libraries(app Qt5::DBus) endif() @@ -210,7 +210,7 @@ execute_process(COMMAND COMPONENT ${GITTYUP_NAME}) else() # Windows and UNIX must be ./ otherwise it is interpreted as absolute path - if(UNIX) + if(UNIX AND NOT HAIKU) install( FILES ${CMAKE_SOURCE_DIR}/rsrc/linux/com.github.Murmele.Gittyup.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications -- 2.43.2