mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-18 09:40:05 +02:00
45 lines
1.4 KiB
Plaintext
45 lines
1.4 KiB
Plaintext
From a2f15d667cefe67aca9466c9fac0a66f9a6ebe42 Mon Sep 17 00:00:00 2001
|
|
From: Schrijvers Luc <begasus@gmail.com>
|
|
Date: Wed, 13 Mar 2024 19:19:19 +0100
|
|
Subject: Disable X11
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 8f3516e..e047a4f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -37,7 +37,7 @@ endif()
|
|
|
|
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED Widgets Svg)
|
|
|
|
-if (UNIX AND NOT APPLE)
|
|
+if (UNIX AND NOT APPLE AND NOT HAIKU)
|
|
find_package(X11 REQUIRED)
|
|
endif ()
|
|
|
|
@@ -78,7 +78,7 @@ target_include_directories(kImageAnnotator
|
|
|
|
target_link_libraries(kImageAnnotator PUBLIC Qt${QT_MAJOR_VERSION}::Widgets Qt${QT_MAJOR_VERSION}::Svg PRIVATE kColorPicker::kColorPicker)
|
|
|
|
-if (UNIX AND NOT APPLE)
|
|
+if (UNIX AND NOT APPLE AND NOT HAIKU)
|
|
# X11::X11 imported target only available with sufficiently new CMake
|
|
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14.0)
|
|
target_link_libraries(kImageAnnotator PRIVATE X11::X11)
|
|
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
|
index fe2d1da..0f862e7 100644
|
|
--- a/tests/CMakeLists.txt
|
|
+++ b/tests/CMakeLists.txt
|
|
@@ -74,7 +74,7 @@ target_link_libraries(KIMAGEANNOTATOR_STATIC
|
|
kColorPicker::kColorPicker
|
|
Qt${QT_MAJOR_VERSION}::Svg)
|
|
|
|
-if (UNIX AND NOT APPLE)
|
|
+if (UNIX AND NOT APPLE AND NOT HAIKU)
|
|
# X11::X11 imported target only available with sufficiently new CMake
|
|
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14.0)
|
|
target_link_libraries(KIMAGEANNOTATOR_STATIC X11::X11)
|
|
--
|
|
2.43.2
|
|
|