--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -705,8 +705,8 @@ else() endif() # Qt Advanced Docking System (required) ##################### -find_package(qt${QT_VERSION_MAJOR}advanceddocking CONFIG QUIET) -if(NOT qt${QT_VERSION_MAJOR}advanceddocking_FOUND) +find_package(qtadvanceddocking-qt${QT_VERSION_MAJOR} CONFIG QUIET) +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) --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -547,9 +547,9 @@ target_include_directories(labplotbackendlib PUBLIC ${FRONTEND_DIR}/widgets) # s target_include_directories(labplotlib PUBLIC ${FRONTEND_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: ${QADS_LIBRARIES}, ${QADS_INCLUDES}") target_include_directories(labplotbackendlib PUBLIC ${QADS_INCLUDES}) target_include_directories(labplotlib PUBLIC ${QADS_INCLUDES}) @@ -605,7 +605,7 @@ target_link_libraries(labplotbackendlib ${LIBCERF_LIBRARIES} ${MATIO_LIBRARIES} ${READSTAT_LIBRARIES} - ads::qt${QT_VERSION_MAJOR}advanceddocking + ads::qtadvanceddocking-qt${QT_VERSION_MAJOR} ) target_link_libraries(labplotlib Qt${QT_MAJOR_VERSION}::Sql @@ -624,7 +624,7 @@ target_link_libraries(labplotlib 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)