From 1f1787b5ac8b1a5940b0f42e4a89e738f707cbc7 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Tue, 1 Jul 2025 15:46:57 -0700 Subject: [PATCH] Consolidate into a single CMake folder (#469) * Consolidate into a single CMake folder' * Remove extra path thing --- {cmake => CMake}/Findiniparser.cmake | 0 {cmake => CMake}/detectcpu.cmake | 0 CMakeLists.txt | 2 +- packaging/linux/flatpak/org.legoisland.Isle.json | 11 +---------- 4 files changed, 2 insertions(+), 11 deletions(-) rename {cmake => CMake}/Findiniparser.cmake (100%) rename {cmake => CMake}/detectcpu.cmake (100%) diff --git a/cmake/Findiniparser.cmake b/CMake/Findiniparser.cmake similarity index 100% rename from cmake/Findiniparser.cmake rename to CMake/Findiniparser.cmake diff --git a/cmake/detectcpu.cmake b/CMake/detectcpu.cmake similarity index 100% rename from cmake/detectcpu.cmake rename to CMake/detectcpu.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index e9812aea..f758bd95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") include(CheckCXXSourceCompiles) include(CMakeDependentOption) include(CMakePushCheckState) -include(cmake/detectcpu.cmake) +include(CMake/detectcpu.cmake) DetectTargetCPUArchitectures(ISLE_CPUS) diff --git a/packaging/linux/flatpak/org.legoisland.Isle.json b/packaging/linux/flatpak/org.legoisland.Isle.json index e8cd3f8e..178434fa 100644 --- a/packaging/linux/flatpak/org.legoisland.Isle.json +++ b/packaging/linux/flatpak/org.legoisland.Isle.json @@ -1,12 +1,9 @@ { "id": "org.legoisland.Isle", - "runtime": "org.kde.Platform", "sdk": "org.kde.Sdk", "runtime-version": "6.8", - "command": "isle", - "finish-args": [ "--share=ipc", "--socket=wayland", @@ -19,7 +16,6 @@ "--filesystem=/mnt/:ro", "--filesystem=home:ro" ], - "modules": [ { "name": "isle", @@ -34,11 +30,6 @@ "path": "../../../3rdparty", "dest": "3rdparty/" }, - { - "type": "dir", - "path": "../../../cmake", - "dest": "cmake/" - }, { "type": "dir", "path": "../../../CMake", @@ -86,4 +77,4 @@ } } ] -} +} \ No newline at end of file