From 733e93e1aef9170c7af416e91b7d2d9544209f59 Mon Sep 17 00:00:00 2001
From: Kasper Peeters <kasper.peeters@cadabra.science>
Date: Fri, 27 Sep 2024 09:31:41 +0100
Subject: [PATCH] Attempt to enforce shared library use for pkgconfig.

---
 CMakeLists.txt                              |  2 ++
 config/install_script.iss                   |  2 +-
 config/science.cadabra.cadabra2-gtk.desktop |  2 +-
 frontend/gtkmm/CMakeLists.txt               | 30 +++++++--------------
 submodules/microtex                         |  2 +-
 5 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78aae8e6b3..6bce6b0d48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,8 @@ if (APPLE)
    set(ENV{PKG_CONFIG_PATH} "/usr/local/opt/libffi/lib/pkgconfig:")
 endif()
 
+set(PKG_CONFIG_USE_STATIC_LIBS OFF)
+
 # Get version information.
 include(cmake/version.cmake)
 print_header("Building Cadabra version ${CADABRA_VERSION_MAJOR}.${CADABRA_VERSION_MINOR}.${CADABRA_VERSION_PATCH}.${CADABRA_VERSION_TWEAK} (${SYSTEM_BITS}-bit)")
diff --git a/config/install_script.iss b/config/install_script.iss
index 86f9cd48dc..ad04e25dee 100644
--- a/config/install_script.iss
+++ b/config/install_script.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Cadabra2"
-#define MyAppVersion "2.5.4"
+#define MyAppVersion "2.5.5"
 #define MyAppPublisher "Kasper Peeters"
 #define MyAppURL "https://www.cadabra.science/"
 #define MyAppExeName "cadabra2-gtk.exe"
diff --git a/config/science.cadabra.cadabra2-gtk.desktop b/config/science.cadabra.cadabra2-gtk.desktop
index 03579c1e3e..4d0ee48b3e 100644
--- a/config/science.cadabra.cadabra2-gtk.desktop
+++ b/config/science.cadabra.cadabra2-gtk.desktop
@@ -11,4 +11,4 @@ Terminal=false
 Keywords="Computer Algebra";Physics;Mathematics
 MimeType=application/cadabra;application/x-cadabra;
 X-AppImage-Name="Cadabra 2"
-X-AppImage-Version=2.5.4
+X-AppImage-Version=2.5.5
diff --git a/frontend/gtkmm/CMakeLists.txt b/frontend/gtkmm/CMakeLists.txt
index 9f00862fc6..4d4b670f4c 100644
--- a/frontend/gtkmm/CMakeLists.txt
+++ b/frontend/gtkmm/CMakeLists.txt
@@ -159,8 +159,8 @@ if(USE_MICROTEX)
     ${microtex_SOURCE_DIR}/lib
     ${microtex_SOURCE_DIR}/platform    
   )
-  find_package(Fontconfig REQUIRED)
-  #  pkg_check_modules(tinyxml2 REQUIRED IMPORTED_TARGET tinyxml2)
+  # find_package(Fontconfig REQUIRED)
+  pkg_check_modules(Fontconfig REQUIRED IMPORTED_TARGET fontconfig)
 endif()
 pkg_check_modules(CairoMM REQUIRED IMPORTED_TARGET cairomm-1.0)
 pkg_check_modules(PangoMM REQUIRED IMPORTED_TARGET pangomm-1.4)
@@ -169,7 +169,8 @@ pkg_check_modules(PangoMM REQUIRED IMPORTED_TARGET pangomm-1.4)
 # add_executable(microtest microtest.cc)
 
 target_link_libraries(
-  cadabra2-gtk 
+  cadabra2-gtk
+  PUBLIC
   cadabra_client 
   ${Boost_LIBRARIES} 
   ${GLIBMM_LIBRARIES} 
@@ -179,28 +180,17 @@ target_link_libraries(
 )
 
 if(USE_MICROTEX)
-  target_link_libraries(cadabra2-gtk 
+  target_link_libraries(
+    cadabra2-gtk
+    PUBLIC
     microtex-cairo          # from MicroTeX
     microtex                # from MicroTeX
-    PkgConfig::CairoMM      # for MicroTeX
-    PkgConfig::PangoMM      # for MicroTeX
-    Fontconfig::Fontconfig  # for MicroTeX
+    ${CairoMM_LIBRARIES}
+    ${PangoMM_LIBRARIES}
+    ${Fontconfig_LIBRARIES}
   )
 endif()
 
-# target_link_libraries(microtest 
-# 	${PROJECT_SOURCE_DIR}/../../libs/microtex/build/libLaTeX.a
-# 	${GLIBMM_LIBRARIES} 
-# 	${GTKMM3_LIBRARIES} 
-# 	Threads::Threads
-# 	PkgConfig::GTKMM
-#         PkgConfig::CairoMM
-# 	PkgConfig::GSVMM
-#         Fontconfig::Fontconfig
-# 	tinyxml2
-# 	Threads::Threads
-# )
-
 
 #---------------------------------------------------------------------------
 # Installation.
diff --git a/submodules/microtex b/submodules/microtex
index d68cf35344..ecdff1d3c9 160000
--- a/submodules/microtex
+++ b/submodules/microtex
@@ -1 +1 @@
-Subproject commit d68cf3534416ee9985c6dbfb88a9c4e427ea254d
+Subproject commit ecdff1d3c9ffa89d7580ed7faa5013995e917118