QT/LibQQt
1
0
Fork 0
mirror of https://gitee.com/drabel/LibQQt.git synced 2025-01-04 10:18:44 +08:00
Code Issues Projects Releases Wiki Activity

update windows install sdk logic

Browse Source
This commit is contained in:
tianduanrui 2017-11-26 13:54:07 +08:00
parent f3923068e2
commit 4d18c05f18
8 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
extra/toolchain-armv7.cmake → cmake/toolchain-armv7.cmake
View File

0
extra/toolchain-macos.cmake → cmake/toolchain-macos.cmake
View File

0
extra/toolchain-mingw32.cmake → cmake/toolchain-mingw32.cmake
View File

0
extra/toolchain-mingw32_qt4.cmake → cmake/toolchain-mingw32_qt4.cmake
View File

0
extra/toolchain-ubuntu.cmake → cmake/toolchain-ubuntu.cmake
View File

0
extra/toolchain-win64.cmake → cmake/toolchain-win64.cmake
View File

11
src/qqt.pro
View File

@ -74,11 +74,6 @@ build_pass:CONFIG(debug, debug|release) {
CLFLAGS = -Wno-unused-parameter -Wno-reorder -Wno-c++11-extensions -Wno-c++11-long-long
QMAKE_CFLAGS += $${CLFLAGS}
QMAKE_CXXFLAGS += $${CLFLAGS}
#debug.
#QMAKE_POST_LINK won't work until source changed
#qmake pro pri prf change won't effect to QMAKE_POST_LINK
#but I need it before I complete this pri.
system("touch $${PWD}/frame/qqtapplication.cpp")
#################################################################
##project Headers
#################################################################
@ -127,7 +122,13 @@ RESOURCES += \
################################################
##install to Qt library
##in this section, I use QMAKE_POST_LINK, it won't work until project source changed
##on windows, I use touch.exe and cp.exe, you need download it and put it in system dir.
################################################
#debug.
#QMAKE_POST_LINK won't work until source changed
#qmake pro pri prf change won't effect to QMAKE_POST_LINK
#but I need it before I complete this pri.
system("touch $${PWD}/frame/qqtapplication.cpp")
!contains(QKIT_PRIVATE, WIN32|WIN64) {
CONFIG += qqt_create_sdk
}

22
src/qqt_install.pri
View File

@ -151,8 +151,8 @@ defineReplace(create_windows_sdk) {
#need cd sdk root
command =
command += $$COPY $$HEADERS_WIN $${QQT_INC_DIR} $$CMD_SEP
command += $$COPY_DIR $${QQT_BUILD_DIR}\\* $${QQT_LIB_DIR}
command += cp -rf $$HEADERS_WIN $${QQT_INC_DIR} $$CMD_SEP
command += $$COPY_DIR $${QQT_BUILD_DIR}\* $${QQT_LIB_DIR}
return ($$command)
}
@ -214,9 +214,18 @@ defineReplace(create_qt_lib_pri){
command += echo "QT.$${module_name}.VERSION = $${QQT_VERSION}" >> $${QQT_PRI_FILEPATH} $$CMD_SEP
command += echo "QT.$${module_name}.name = $${MODULE_NAME}" >> $${QQT_PRI_FILEPATH} $$CMD_SEP
command += echo "QT.$${module_name}.module = $${MODULE_NAME}" >> $${QQT_PRI_FILEPATH} $$CMD_SEP
contains(QKIT_PRIVATE, WIN32|WIN64) {
command += echo "QT.$${module_name}.libs = \$$QT_MODULE_LIB_BASE" >> $${QQT_PRI_FILEPATH} $$CMD_SEP
command += echo "QT.$${module_name}.bins = \$$QT_MODULE_BIN_BASE" >> $${QQT_PRI_FILEPATH} $$CMD_SEP
} else {
command += echo "QT.$${module_name}.libs = '\$$QT_MODULE_LIB_BASE'" >> $${QQT_PRI_FILEPATH} $$CMD_SEP
command += echo "QT.$${module_name}.bins = '\$$QT_MODULE_BIN_BASE'" >> $${QQT_PRI_FILEPATH} $$CMD_SEP
equals(QKIT_PRIVATE, macOS) {
}
contains(QKIT_PRIVATE, WIN32|WIN64) {
command += echo "QT.$${module_name}.includes = \$$QT_MODULE_INCLUDE_BASE \$$QT_MODULE_INCLUDE_BASE/$${MODULE_NAME}" >> $${QQT_PRI_FILEPATH} $$CMD_SEP
command += echo "QT.$${module_name}.frameworks = " >> $${QQT_PRI_FILEPATH} $$CMD_SEP
command += echo "QT.$${module_name}.module_config = v2 " >> $${QQT_PRI_FILEPATH} $$CMD_SEP
}else:equals(QKIT_PRIVATE, macOS) {
command += echo "QT.$${module_name}.includes = '\$$QT_MODULE_LIB_BASE/$${MODULE_NAME}.framework/Headers'" >> $${QQT_PRI_FILEPATH} $$CMD_SEP
command += echo "QT.$${module_name}.frameworks = '\$$QT_MODULE_LIB_BASE'" >> $${QQT_PRI_FILEPATH} $$CMD_SEP
command += echo "QT.$${module_name}.module_config = v2 lib_bundle" >> $${QQT_PRI_FILEPATH} $$CMD_SEP
@ -274,6 +283,8 @@ contains(CONFIG, qqt_create_sdk){
HEADERS_WIN=$${HEADERS}
HEADERS_WIN~=s,/,\\,g
#qmake regexp use perl grammer
#HEADERS_WIN~=s/[d ]+/h+/g how to mod space to +
post_link =
post_link += $$RM_DIR $$QQT_SDK_PWD $$CMD_SEP
@ -283,7 +294,7 @@ contains(CONFIG, qqt_create_sdk){
#message(create QQt windows struct library)
post_link += $$create_windows_sdk() $$CMD_SEP
post_link += $$COPY $$QQT_BUILD_DIR\\*.prl lib $$CMD_SEP
post_link += $$COPY $$QQT_BUILD_DIR\*.prl lib $$CMD_SEP
} else {
post_link =
post_link += $$RM_DIR $$QQT_SDK_PWD $$CMD_SEP
@ -307,10 +318,9 @@ contains(CONFIG, qqt_create_sdk){
}
post_link += $$create_qt_lib_pri()
QMAKE_POST_LINK += $${post_link}
#message ($$post_link)
message ($$post_link)
}
#if you want to use QQt with QT += QQt please open this feature
#unimplete: CONFIG += install_to_qt_library
contains(CONFIG, install_to_qt_library){