Skip to content

Commit

Permalink
Attempt to enforce shared library use for pkgconfig.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kasper Peeters committed Sep 27, 2024
1 parent 2b1cf39 commit 733e93e
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 23 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)")
Expand Down
2 changes: 1 addition & 1 deletion config/install_script.iss
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion config/science.cadabra.cadabra2-gtk.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
30 changes: 10 additions & 20 deletions frontend/gtkmm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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}
Expand All @@ -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.
Expand Down

0 comments on commit 733e93e

Please sign in to comment.