qmake: adapt latest cmake changes
Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
parent
69ef2a6ca1
commit
5cd386a419
|
@ -1,6 +1,8 @@
|
||||||
QT += core core-private gui gui-private
|
QT += core core-private gui gui-private
|
||||||
|
|
||||||
CORE_PUB_INC_DIR = $$PWD/../include/FramelessHelper/Core
|
BASE_INC_DIR = $$PWD/../include
|
||||||
|
COMMON_INC_DIR = $$BASE_INC_DIR/FramelessHelper
|
||||||
|
CORE_PUB_INC_DIR = $$COMMON_INC_DIR/Core
|
||||||
CORE_PRIV_INC_DIR = $$CORE_PUB_INC_DIR/private
|
CORE_PRIV_INC_DIR = $$CORE_PUB_INC_DIR/private
|
||||||
CORE_EXTRA_INC_DIR = $$PWD/inc/core
|
CORE_EXTRA_INC_DIR = $$PWD/inc/core
|
||||||
CORE_SRC_DIR = $$PWD/../src/core
|
CORE_SRC_DIR = $$PWD/../src/core
|
||||||
|
@ -9,11 +11,15 @@ DEFINES += \
|
||||||
FRAMELESSHELPER_CORE_STATIC
|
FRAMELESSHELPER_CORE_STATIC
|
||||||
|
|
||||||
INCLUDEPATH += \
|
INCLUDEPATH += \
|
||||||
|
$$BASE_INC_DIR \
|
||||||
|
$$COMMON_INC_DIR \
|
||||||
$$CORE_PUB_INC_DIR \
|
$$CORE_PUB_INC_DIR \
|
||||||
$$CORE_PRIV_INC_DIR \
|
$$CORE_PRIV_INC_DIR \
|
||||||
$$CORE_EXTRA_INC_DIR
|
$$CORE_EXTRA_INC_DIR
|
||||||
|
|
||||||
DEPENDPATH += \
|
DEPENDPATH += \
|
||||||
|
$$BASE_INC_DIR \
|
||||||
|
$$COMMON_INC_DIR \
|
||||||
$$CORE_PUB_INC_DIR \
|
$$CORE_PUB_INC_DIR \
|
||||||
$$CORE_PRIV_INC_DIR \
|
$$CORE_PRIV_INC_DIR \
|
||||||
$$CORE_EXTRA_INC_DIR
|
$$CORE_EXTRA_INC_DIR
|
||||||
|
@ -65,7 +71,7 @@ win32 {
|
||||||
|
|
||||||
unix:!macx {
|
unix:!macx {
|
||||||
CONFIG += link_pkgconfig
|
CONFIG += link_pkgconfig
|
||||||
PKGCONFIG += gtk+-3.0
|
PKGCONFIG += xcb gtk+-3.0
|
||||||
DEFINES += GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6
|
DEFINES += GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6
|
||||||
HEADERS += \
|
HEADERS += \
|
||||||
$$CORE_PUB_INC_DIR/framelesshelper_linux.h
|
$$CORE_PUB_INC_DIR/framelesshelper_linux.h
|
||||||
|
|
|
@ -3,7 +3,9 @@ QT += \
|
||||||
quicktemplates2 quicktemplates2-private \
|
quicktemplates2 quicktemplates2-private \
|
||||||
quickcontrols2 quickcontrols2-private
|
quickcontrols2 quickcontrols2-private
|
||||||
|
|
||||||
QUICK_PUB_INC_DIR = $$PWD/../include/FramelessHelper/Quick
|
BASE_INC_DIR = $$PWD/../include
|
||||||
|
COMMON_INC_DIR = $$BASE_INC_DIR/FramelessHelper
|
||||||
|
QUICK_PUB_INC_DIR = $$COMMON_INC_DIR/Quick
|
||||||
QUICK_PRIV_INC_DIR = $$QUICK_PUB_INC_DIR/private
|
QUICK_PRIV_INC_DIR = $$QUICK_PUB_INC_DIR/private
|
||||||
QUICK_SRC_DIR = $$PWD/../src/quick
|
QUICK_SRC_DIR = $$PWD/../src/quick
|
||||||
|
|
||||||
|
@ -11,10 +13,14 @@ DEFINES += \
|
||||||
FRAMELESSHELPER_QUICK_STATIC
|
FRAMELESSHELPER_QUICK_STATIC
|
||||||
|
|
||||||
INCLUDEPATH += \
|
INCLUDEPATH += \
|
||||||
|
$$BASE_INC_DIR \
|
||||||
|
$$COMMON_INC_DIR \
|
||||||
$$QUICK_PUB_INC_DIR \
|
$$QUICK_PUB_INC_DIR \
|
||||||
$$QUICK_PRIV_INC_DIR
|
$$QUICK_PRIV_INC_DIR
|
||||||
|
|
||||||
DEPENDPATH += \
|
DEPENDPATH += \
|
||||||
|
$$BASE_INC_DIR \
|
||||||
|
$$COMMON_INC_DIR \
|
||||||
$$QUICK_PUB_INC_DIR \
|
$$QUICK_PUB_INC_DIR \
|
||||||
$$QUICK_PRIV_INC_DIR
|
$$QUICK_PRIV_INC_DIR
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
QT += widgets widgets-private
|
QT += widgets
|
||||||
|
|
||||||
WIDGETS_PUB_INC_DIR = $$PWD/../include/FramelessHelper/Widgets
|
BASE_INC_DIR = $$PWD/../include
|
||||||
|
COMMON_INC_DIR = $$BASE_INC_DIR/FramelessHelper
|
||||||
|
WIDGETS_PUB_INC_DIR = $$COMMON_INC_DIR/Widgets
|
||||||
WIDGETS_PRIV_INC_DIR = $$WIDGETS_PUB_INC_DIR/private
|
WIDGETS_PRIV_INC_DIR = $$WIDGETS_PUB_INC_DIR/private
|
||||||
WIDGETS_SRC_DIR = $$PWD/../src/widgets
|
WIDGETS_SRC_DIR = $$PWD/../src/widgets
|
||||||
|
|
||||||
|
@ -8,10 +10,14 @@ DEFINES += \
|
||||||
FRAMELESSHELPER_WIDGETS_STATIC
|
FRAMELESSHELPER_WIDGETS_STATIC
|
||||||
|
|
||||||
INCLUDEPATH += \
|
INCLUDEPATH += \
|
||||||
|
$$BASE_INC_DIR \
|
||||||
|
$$COMMON_INC_DIR \
|
||||||
$$WIDGETS_PUB_INC_DIR \
|
$$WIDGETS_PUB_INC_DIR \
|
||||||
$$WIDGETS_PRIV_INC_DIR
|
$$WIDGETS_PRIV_INC_DIR
|
||||||
|
|
||||||
DEPENDPATH += \
|
DEPENDPATH += \
|
||||||
|
$$BASE_INC_DIR \
|
||||||
|
$$COMMON_INC_DIR \
|
||||||
$$WIDGETS_PUB_INC_DIR \
|
$$WIDGETS_PUB_INC_DIR \
|
||||||
$$WIDGETS_PRIV_INC_DIR
|
$$WIDGETS_PRIV_INC_DIR
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue