From c1fffe906a7ca5760ae5f6505d949e0f7278667a Mon Sep 17 00:00:00 2001 From: Gautier Hattenberger Date: Wed, 22 Jan 2025 18:20:06 +0100 Subject: [PATCH] [build] check gnomecanvas package before compiling legacy GCS (#3422) This module is not supported with the custon lablgtk2 for 24.04 --- sw/ground_segment/cockpit/Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sw/ground_segment/cockpit/Makefile b/sw/ground_segment/cockpit/Makefile index 9230fbbb93..308662279e 100644 --- a/sw/ground_segment/cockpit/Makefile +++ b/sw/ground_segment/cockpit/Makefile @@ -47,6 +47,7 @@ LABLGTK2INIT = $(shell ocamlfind query -p-format lablgtk2.auto-init 2>/dev/null) endif LABLGTK2GLADE = $(shell ocamlfind query -p-format lablgtk2.glade 2>/dev/null) +LABLGTK2CANVAS = $(shell ocamlfind query -p-format lablgtk2-gnome.gnomecanvas 2>/dev/null) ML= gtk_setting_time.ml gtk_strip.ml horizon.ml strip.ml gtk_save_settings.ml saveSettings.ml page_settings.ml pages.ml speech.ml plugin.ml sectors.ml map2d.ml editFP.ml intruders.ml shapes.ml live.ml particules.ml papgets.ml gcs.ml MAIN=gcs @@ -71,6 +72,16 @@ all : opt : @echo Skipping legacy GCS.opt build \(missing lablgtk2.glade\) +else + +ifeq ($(LABLGTK2CANVAS),) + +all : + @echo Skipping legacy GCS build \(missing lablgtk2-gnome.gnomecanvas\) + +opt : + @echo Skipping legacy GCS.opt build \(missing lablgtk2-gnome.gnomecanvas\) + else all : $(MAIN) @@ -79,6 +90,7 @@ opt : $(MAIN).opt endif endif endif +endif gcslib : $(Q)$(MAKE) -C lib