mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
35 lines
1.2 KiB
Plaintext
35 lines
1.2 KiB
Plaintext
From 6778909b16c804044adc5bec7ad54b609460be89 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Sat, 22 Apr 2017 14:24:24 +0200
|
|
Subject: Haiku patch
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 1fabdfc..19e2347 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -158,6 +158,8 @@ set(GRAPHICAL_RENDERER "auto" CACHE STRING "Policy for choosing the renderer bac
|
|
if(CMAKE_HOST_APPLE)
|
|
set(_bundle_bin gcompris-qt.app/Contents/MacOS)
|
|
set(_data_dest_dir bin/${_bundle_bin}/../Resources)
|
|
+elseif(HAIKU)
|
|
+ set(_data_dest_dir data/${GCOMPRIS_EXECUTABLE_NAME})
|
|
else()
|
|
set(_data_dest_dir share/${GCOMPRIS_EXECUTABLE_NAME})
|
|
endif()
|
|
diff --git a/cmake/rcc.cmake b/cmake/rcc.cmake
|
|
index 633bc35..5e589cf 100644
|
|
--- a/cmake/rcc.cmake
|
|
+++ b/cmake/rcc.cmake
|
|
@@ -51,7 +51,7 @@ function(GCOMPRIS_ADD_RCC resource_path)
|
|
if(CMAKE_HOST_APPLE)
|
|
install(FILES ${CREATED_RCC} DESTINATION ${GCOMPRIS_EXECUTABLE_NAME}.app/Contents/MacOS/rcc)
|
|
else()
|
|
- install(FILES ${CREATED_RCC} DESTINATION share/${GCOMPRIS_EXECUTABLE_NAME}/rcc)
|
|
+ install(FILES ${CREATED_RCC} DESTINATION ${_data_dest_dir}/rcc)
|
|
endif()
|
|
|
|
add_custom_target(
|
|
--
|
|
2.30.2
|
|
|