45 lines
2.1 KiB
Diff
45 lines
2.1 KiB
Diff
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -9,8 +9,8 @@
|
|
set(CMAKE_AUTOMOC ON)
|
|
set(SRC_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
|
|
|
|
-find_package(qt${QT_VERSION_MAJOR}advanceddocking CONFIG)
|
|
-if (NOT qt${QT_VERSION_MAJOR}advanceddocking_FOUND)
|
|
+find_package(qtadvanceddocking-qt${QT_VERSION_MAJOR} CONFIG)
|
|
+if (NOT qtadvanceddocking-qt${QT_VERSION_MAJOR}_FOUND)
|
|
option(LOCAL_QT_ADVANCED_DOCK_DOWNLOAD "Use local build of qt advanced dock downloaded directly from the git repository" OFF)
|
|
option(LOCAL_QT_ADVANCED_DOCK_COPY "Use local build of qt advanced dock copied into the Qt-Advanced-Docking-System subfolder" ON)
|
|
if (TARGET Qt${QT_VERSION_MAJOR}::GuiPrivate)
|
|
@@ -554,9 +554,9 @@
|
|
target_include_directories(labplot2lib PUBLIC ${COMMONFRONTEND_DIR}/widgets) # so that the MOC finds numberSpinbox.h
|
|
|
|
# add system QADS include path
|
|
-if (qt${QT_VERSION_MAJOR}advanceddocking_FOUND)
|
|
- get_target_property(QADS_INCLUDES ads::qt${QT_VERSION_MAJOR}advanceddocking INTERFACE_INCLUDE_DIRECTORIES)
|
|
- get_target_property(QADS_LIBRARIES ads::qt${QT_VERSION_MAJOR}advanceddocking INTERFACE_LINK_LIBRARIES)
|
|
+if (qtadvanceddocking-qt${QT_VERSION_MAJOR}_FOUND)
|
|
+ get_target_property(QADS_INCLUDES ads::qtadvanceddocking-qt${QT_VERSION_MAJOR} INTERFACE_INCLUDE_DIRECTORIES)
|
|
+ get_target_property(QADS_LIBRARIES ads::qtadvanceddocking-qt${QT_VERSION_MAJOR} INTERFACE_LINK_LIBRARIES)
|
|
MESSAGE (STATUS "QADS Found LINK_LIBRARIES: ${QADS_LIBRARIES} INCLUDES: ${QADS_INCLUDES}")
|
|
target_include_directories( labplot2backendlib PRIVATE ${QADS_INCLUDES} )
|
|
target_include_directories( labplot2lib PRIVATE ${QADS_INCLUDES} )
|
|
@@ -591,7 +591,7 @@
|
|
${CFITSIO_LIBRARIES}
|
|
${LIBCERF_LIBRARIES}
|
|
${MATIO_LIBRARIES}
|
|
- ads::qt${QT_VERSION_MAJOR}advanceddocking
|
|
+ ads::qtadvanceddocking-qt${QT_VERSION_MAJOR}
|
|
)
|
|
target_link_libraries( labplot2lib
|
|
Qt${QT_MAJOR_VERSION}::Svg
|
|
@@ -611,7 +611,7 @@
|
|
KF${KF_MAJOR_VERSION}::Archive # KFilterDev
|
|
KF${KF_MAJOR_VERSION}::TextWidgets # KTextEdit
|
|
${Poppler_LIBRARIES}
|
|
- ads::qt${QT_VERSION_MAJOR}advanceddocking
|
|
+ ads::qtadvanceddocking-qt${QT_VERSION_MAJOR}
|
|
)
|
|
|
|
IF (Qt${QT_MAJOR_VERSION}SerialPort_FOUND)
|