From: Iceyer Date: Tue, 16 Jan 2018 02:02:39 +0000 (+0800) Subject: feat: remove build version from install path X-Git-Tag: archive/raspbian/5.7.12-2+rpi1^2~130^2~21 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3bf0bfb5f49c3e83d4c36cc33f219150bf3731d8;p=dtkcore.git feat: remove build version from install path Change-Id: I0b6a0e2ed350f570792975831b4b5ed1f5fd1a3e --- diff --git a/src/lib.pri b/src/lib.pri index 69c80d4..1827818 100644 --- a/src/lib.pri +++ b/src/lib.pri @@ -7,25 +7,23 @@ isEmpty(VERSION) { VERSION = $$replace(VERSION, [^0-9.],) } +ver_list = $$split(VERSION, .) + isEmpty(VER_MAJ) { - ver_list = $$split(VERSION, .) VER_MAJ = $$first(ver_list) } isEmpty(VER_MIN) { - ver_list = $$split(VERSION, .) VER_MIN = $$member(ver_list, 1, 1) isEmpty(VER_MIN):VER_MIN = 0 } isEmpty(VER_PAT) { - ver_list = $$split(VERSION, .) VER_PAT = $$member(ver_list, 2, 2) isEmpty(VER_PAT):VER_PAT = 0 } isEmpty(VER_BUI) { - ver_list = $$split(VERSION, .) VER_BUI = $$member(ver_list, 3, 3) isEmpty(VER_BUI):VER_BUI = 0 } @@ -46,9 +44,9 @@ isEmpty(LIB_INSTALL_DIR) { } isEmpty(INCLUDE_INSTALL_DIR) { - DTK_INCLUDEPATH = $$PREFIX/include/libdtk-$$VERSION + DTK_INCLUDEPATH = $$PREFIX/include/libdtk-$${VER_MAJ}.$${VER_MIN}.$${VER_PAT} } else { - DTK_INCLUDEPATH = $$INCLUDE_INSTALL_DIR/libdtk-$$VERSION + DTK_INCLUDEPATH = $$INCLUDE_INSTALL_DIR/libdtk-$${VER_MAJ}.$${VER_MIN}.$${VER_PAT} } win32* {