diff --git a/CMakeLists.txt b/CMakeLists.txt index 023f8d0..29ae38d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,21 +130,19 @@ message( ${VERBOSE} " CMAKE_AUTORCC: ${CMAKE_AUTORCC}") if (USE_QT6) set(QT6_LIBRARIES Qt6::Widgets ) # Ensures all Qt componenets have same version: - find_package(Qt6 ${ddcui_qt6_min_version} COMPONENTS Core Widgets Gui Help REQUIRED) + find_package(Qt6 ${ddcui_qt6_min_version} COMPONENTS Core Widgets Gui REQUIRED) message( ${VERBOSE} "Qt directories:") message( ${VERBOSE} " Qt6Widgets_INCLUDE_DIRS: ${Qt6Widgets_INCLUDE_DIRS}" ) message( ${VERBOSE} " Qt6Core_INCLUDE_DIRS: ${Qt6Core_INCLUDE_DIRS}" ) message( ${VERBOSE} " Qt6Gui_INCLUDE_DIRS: ${Qt6Gui_INCLUDE_DIRS}" ) - message( ${VERBOSE} " Qt6Help_INCLUDE_DIRS: ${Qt6Help_INCLUDE_DIRS}" ) else() set(QT5_LIBRARIES Qt5::Widgets ) # Ensures all Qt componenets have same version: - find_package(Qt5 ${ddcui_qt5_min_version} COMPONENTS Core Widgets Gui Help REQUIRED) + find_package(Qt5 ${ddcui_qt5_min_version} COMPONENTS Core Widgets Gui REQUIRED) message( ${VERBOSE} "Qt directories:") message( ${VERBOSE} " Qt5Widgets_INCLUDE_DIRS: ${Qt5Widgets_INCLUDE_DIRS}" ) message( ${VERBOSE} " Qt5Core_INCLUDE_DIRS: ${Qt5Core_INCLUDE_DIRS}" ) message( ${VERBOSE} " Qt5Gui_INCLUDE_DIRS: ${Qt5Gui_INCLUDE_DIRS}" ) - message( ${VERBOSE} " Qt5Help_INCLUDE_DIRS: ${Qt5Help_INCLUDE_DIRS}" ) endif() find_package (PkgConfig REQUIRED ) @@ -297,7 +295,8 @@ target_compile_options(ddcui PUBLIC "-fPIC" ${coverity_cflags} ${asan_flags}) # redundant: ${Qt5Gui_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}. # ${Qt5Help_INCLUDE_DIRS} is a superset of them all target_include_directories(ddcui SYSTEM PRIVATE - ${Qt5Help_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} + ${Qt5Widgets_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${DDCUTIL_INCLUDE_DIRS})