|
Lines 93-104
Link Here
|
| 93 |
|
93 |
|
| 94 |
set(QT5_LIBRARIES Qt5::Widgets ) |
94 |
set(QT5_LIBRARIES Qt5::Widgets ) |
| 95 |
# Ensures all Qt componenets have same version: |
95 |
# Ensures all Qt componenets have same version: |
| 96 |
find_package(Qt5 ${ddcui_qt_version} COMPONENTS Core Widgets Gui Help REQUIRED) |
96 |
find_package(Qt5 ${ddcui_qt_version} COMPONENTS Core Widgets Gui REQUIRED) |
| 97 |
message( ${VERBOSE} "Qt directories:") |
97 |
message( ${VERBOSE} "Qt directories:") |
| 98 |
message( ${VERBOSE} " Qt5Widgets_INCLUDE_DIRS: ${Qt5Widgets_INCLUDE_DIRS}" ) |
98 |
message( ${VERBOSE} " Qt5Widgets_INCLUDE_DIRS: ${Qt5Widgets_INCLUDE_DIRS}" ) |
| 99 |
message( ${VERBOSE} " Qt5Core_INCLUDE_DIRS: ${Qt5Core_INCLUDE_DIRS}" ) |
99 |
message( ${VERBOSE} " Qt5Core_INCLUDE_DIRS: ${Qt5Core_INCLUDE_DIRS}" ) |
| 100 |
message( ${VERBOSE} " Qt5Gui_INCLUDE_DIRS: ${Qt5Gui_INCLUDE_DIRS}" ) |
100 |
message( ${VERBOSE} " Qt5Gui_INCLUDE_DIRS: ${Qt5Gui_INCLUDE_DIRS}" ) |
| 101 |
message( ${VERBOSE} " Qt5Help_INCLUDE_DIRS: ${Qt5Help_INCLUDE_DIRS}" ) |
|
|
| 102 |
|
101 |
|
| 103 |
find_package (PkgConfig REQUIRED ) |
102 |
find_package (PkgConfig REQUIRED ) |
| 104 |
pkg_check_modules(GLIB2 REQUIRED glib-2.0>=${ddcui_glib_version}) |
103 |
pkg_check_modules(GLIB2 REQUIRED glib-2.0>=${ddcui_glib_version}) |
|
Lines 215-223
Link Here
|
| 215 |
# add_compile_options(-Og -H V=1) |
214 |
# add_compile_options(-Og -H V=1) |
| 216 |
|
215 |
|
| 217 |
# redundant: ${Qt5Gui_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}. |
216 |
# redundant: ${Qt5Gui_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}. |
| 218 |
# ${Qt5Help_INCLUDE_DIRS} is a superset of them all |
|
|
| 219 |
target_include_directories(ddcui SYSTEM PRIVATE |
217 |
target_include_directories(ddcui SYSTEM PRIVATE |
| 220 |
${Qt5Help_INCLUDE_DIRS} |
218 |
${Qt5Gui_INCLUDE_DIRS} |
|
|
219 |
${Qt5Widgets_INCLUDE_DIRS} |
| 221 |
${GLIB2_INCLUDE_DIRS} |
220 |
${GLIB2_INCLUDE_DIRS} |
| 222 |
${DDCUTIL_INCLUDE_DIRS}) |
221 |
${DDCUTIL_INCLUDE_DIRS}) |
| 223 |
|
222 |
|
