Commit e07716b7 authored by Stefan Gerlach's avatar Stefan Gerlach

Fix compilation with older Cantor installed

parent 59c78fa6
......@@ -228,8 +228,9 @@ IF (Cantor_FOUND)
add_definitions (-DOLD_CANTORLIBS_VERSION)
ENDIF ()
IF (${Cantor_VERSION} VERSION_GREATER "19.11")
FIND_PACKAGE(Poppler "0.62.0" REQUIRED COMPONENTS Qt5)
add_definitions (-DHAVE_CANTOR_LIBS)
set(RECENT_CANTOR TRUE)
FIND_PACKAGE(Poppler "0.62.0" REQUIRED COMPONENTS Qt5)
ELSE ()
MESSAGE (STATUS "Cantor Library ${Cantor_VERSION} TOO OLD. Minimum usable version is 19.12")
ENDIF ()
......
......@@ -388,7 +388,7 @@ set(COMMONFRONTEND_SOURCES
${COMMONFRONTEND_DIR}/datapicker/DatapickerImageView.cpp
)
IF (${Cantor_FOUND})
IF (RECENT_CANTOR)
set(CANTOR_SOURCES
${KDEFRONTEND_DIR}/dockwidgets/CantorWorksheetDock.cpp
${BACKEND_DIR}/cantorWorksheet/VariableParser.cpp
......@@ -465,11 +465,9 @@ if (KUserFeedback_FOUND)
endif()
#TODO: KF5::NewStuff
IF (Cantor_FOUND)
target_link_libraries( labplot2lib Cantor::cantorlibs KF5::Service KF5::Parts)
IF (${Cantor_VERSION} VERSION_GREATER "19.11")
target_link_libraries( labplot2lib Poppler::Qt5)
ENDIF()
IF (RECENT_CANTOR)
# KF5::Service, KF5::Parts is optional but probably required by Cantor
target_link_libraries( labplot2lib Cantor::cantorlibs KF5::Service KF5::Parts Poppler::Qt5)
ENDIF ()
IF (HDF5_FOUND)
target_link_libraries( labplot2lib ${HDF5_LIBRARIES} )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment