Merge branch 'master' of github.com:-1mhu/gds-render

Update .github/workflows/cmake.yml
2025-07-27 19:09:46 +02:00 · 2025-07-27 19:02:15 +02:00 · 2025-07-27 19:00:04 +02:00 · 2025-07-27 18:58:50 +02:00 · 2025-07-27 18:56:40 +02:00 · 2025-05-10 23:21:28 +02:00
6 changed files with 11 additions and 6 deletions
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -5,6 +5,8 @@ on:
    branches: [ master ]
  pull_request:
    branches: [ master ]
+  workflow_dispatch:
+  

 env:
  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -28,7 +30,8 @@ jobs:
      if: runner.os == 'Linux'
      run: |
        sudo apt-get update
-        sudo apt-get -y install libgtk-3-dev gettext
+        sudo apt-get -y install libgtk-3-dev gettext cmake python3 libpython3-dev
+        echo "Installation successful"

    - name: Configure CMake
      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
--- a/3rdparty/libfort
+++ b/3rdparty/libfort
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.6...3.18)
 project(gds-render LANGUAGES C)

 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
@@ -24,7 +25,7 @@ if(NOT WIN32)
  set(BoldWhite   "${Esc}[1;37m")
 endif()

-cmake_minimum_required(VERSION 2.8)
+
 find_package(PkgConfig REQUIRED)
 pkg_search_module(GLIB REQUIRED glib-2.0)
 pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
@@ -80,6 +81,7 @@ add_subdirectory(version)
 set(FORT_ENABLE_TESTING OFF CACHE INTERNAL "")

 add_subdirectory(3rdparty/libfort)
+install(TARGETS fort EXCLUDE_FROM_ALL)

 link_directories(${GLIB_LINK_DIRS} ${GTK3_LINK_DIRS} ${CAIRO_LINK_DIRS})
 add_definitions(${GLIB2_CFLAGS_OTHER})
--- a/main.c
+++ b/main.c
@@ -201,7 +201,7 @@ static int start_gui(int argc, char **argv)
 	application_domain = g_string_new(NULL);
 	g_string_printf(application_domain, "de.shimatta.gds_render_%s", _app_git_commit);

-	gapp = gtk_application_new(application_domain->str, G_APPLICATION_FLAGS_NONE);
+    gapp = gtk_application_new(application_domain->str, G_APPLICATION_DEFAULT_FLAGS);
 	g_string_free(application_domain, TRUE);

 	g_application_register(G_APPLICATION(gapp), NULL, NULL);
--- a/plugins/plugin-example/CMakeLists.txt
+++ b/plugins/plugin-example/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(pluginexample)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8...3.18)
 find_package(PkgConfig REQUIRED)
 pkg_search_module(PYTHON REQUIRED python3)

--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -22,7 +22,7 @@ if(NOT WIN32)
  set(BoldWhite   "${Esc}[1;37m")
 endif()

-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8...3.18)
 find_package(PkgConfig REQUIRED)

 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/catch-framework")
Author	SHA1	Message	Date
Mario	5287bed5f5	Merge branch 'master' of github.com:-1mhu/gds-render All checks were successful CMake / build (push) Successful in 37s Details	2025-07-27 19:09:46 +02:00
Mario Hüttel	560f217e26	Update .github/workflows/cmake.yml All checks were successful CMake / build (push) Successful in 35s Details	2025-07-27 19:02:15 +02:00
Mario Hüttel	2000a45e18	Update .github/workflows/cmake.yml Some checks failed CMake / build (push) Failing after 30s Details	2025-07-27 19:00:04 +02:00
Mario Hüttel	1a390efc85	Update .github/workflows/cmake.yml Some checks failed CMake / build (push) Failing after 27s Details	2025-07-27 18:58:50 +02:00
Mario Hüttel	22c551750f	Update .github/workflows/cmake.yml Some checks failed CMake / build (push) Failing after 1m21s Details Test workflow on gitea	2025-07-27 18:56:40 +02:00
Mario Hüttel	c9b0783a07	Exclude libfort from installation	2025-05-10 23:21:28 +02:00
Mario Hüttel	f88c1d4bdf	Update deprecated GTK code	2025-05-10 23:13:16 +02:00
Mario Hüttel	4193fd40c1	Update Cmake versions	2025-05-10 23:11:10 +02:00
0mhu	03216a4a86	Update cmake.yml	2024-06-16 20:26:32 +02:00