changed the include strategy from subdir to direct

This commit is contained in:
Dorian Zedler 2020-07-03 14:33:28 +02:00
parent a1ed60bfd7
commit 9dabf9b2a1
Signed by: dorian
GPG key ID: 989DE36109AFA354
17 changed files with 48 additions and 63 deletions

View file

@ -8,14 +8,17 @@
!isEmpty(Qt_GMP_LIB):error("GMP.pri already included") !isEmpty(Qt_GMP_LIB):error("GMP.pri already included")
Qt_GMP_LIB = 1 Qt_GMP_LIB = 1
#DEPENDS DEFINES += MINIGMP_LIBRARY
CONFIG(release, debug|release): { DEFINES += QT_DEPRECATED_WARNINGS
MINIGMP_LIBRARY_OUTPUT_DIR="$$PWD/build/release"
} else {
MINIGMP_LIBRARY_OUTPUT_DIR="$$PWD/build/debug"
}
unix:LIBS += -L$$MINIGMP_LIBRARY_OUTPUT_DIR -lQtBigInt
win32:LIBS += -L$$MINIGMP_LIBRARY_OUTPUT_DIR -lQtBigInt HEADERS += \
$$PWD/bigint.h \
$$PWD/mini-gmp.h \
$$PWD/minigmp_global.h
INCLUDEPATH += "$$PWD" SOURCES += \
$$PWD/bigint.cpp \
$$PWD/mini-gmp.c
INCLUDEPATH += $$PWD

View file

@ -8,17 +8,17 @@
!isEmpty(Qt_SECRET_LIB):error("Qt-Secret.pri already included") !isEmpty(Qt_SECRET_LIB):error("Qt-Secret.pri already included")
Qt_SECRET_LIB = 1 Qt_SECRET_LIB = 1
#DEPENDS DEFINES += Qt_SECRET_LIBRARY
CONFIG(release, debug|release): { DEFINES += QT_DEPRECATED_WARNINGS
Qt_SECRET_LIB_OUTPUT_DIR="$$PWD/build/release"
} else {
Qt_SECRET_LIB_OUTPUT_DIR="$$PWD/build/debug"
}
unix:LIBS += -L$$Qt_SECRET_LIB_OUTPUT_DIR -lQt-Secret HEADERS += \
$$PWD/qtsecret_global.h \
$$PWD/Qt-RSA/qrsaencryption.h
win32:LIBS += -L$$Qt_SECRET_LIB_OUTPUT_DIR -lQt-Secret1 SOURCES += \
$$PWD/Qt-RSA/qrsaencryption.cpp
INCLUDEPATH += "$$PWD/Qt-RSA"
INCLUDEPATH += $$PWD $$PWD/Qt-RSA
include($$PWD/GMP/GMP.pri) include($$PWD/GMP/GMP.pri)

View file

@ -5,12 +5,32 @@
# of this license document, but changing it is not allowed. # of this license document, but changing it is not allowed.
# #
TEMPLATE = subdirs QT -= gui
CONFIG += ordered CONFIG += c++11
SUBDIRS += \ TARGET = Qt-Secret
GMP \ TEMPLATE = lib
src
GMP.file = src/GMP/GMP.pro DEFINES += Qt_SECRET_LIBRARY
src.file = src/Qt-Secret.pro DEFINES += QT_DEPRECATED_WARNINGS
#DEPENDS
CONFIG(release, debug|release): {
DESTDIR="$$PWD/build/release"
} else {
DESTDIR="$$PWD/build/debug"
}
include($$PWD/GMP/GMP.pri)
VERSION = 1.2.0
HEADERS += \
qtsecret_global.h \
Qt-RSA/qrsaencryption.h
SOURCES += \
Qt-RSA/qrsaencryption.cpp
target.path = /usr/local/lib
!isEmpty(target.path): INSTALLS += target

View file

@ -1 +0,0 @@
/build/

View file

@ -1 +0,0 @@
/build/

View file

@ -1,36 +0,0 @@
#
# Copyright (C) 2018-2019 QuasarApp.
# Distributed under the lgplv3 software license, see the accompanying
# Everyone is permitted to copy and distribute verbatim copies
# of this license document, but changing it is not allowed.
#
QT -= gui
CONFIG += c++11
TARGET = Qt-Secret
TEMPLATE = lib
DEFINES += Qt_SECRET_LIBRARY
DEFINES += QT_DEPRECATED_WARNINGS
#DEPENDS
CONFIG(release, debug|release): {
DESTDIR="$$PWD/build/release"
} else {
DESTDIR="$$PWD/build/debug"
}
include($$PWD/GMP/GMP.pri)
VERSION = 1.2.0
HEADERS += \
qtsecret_global.h \
Qt-RSA/qrsaencryption.h
SOURCES += \
Qt-RSA/qrsaencryption.cpp
target.path = /usr/local/lib
!isEmpty(target.path): INSTALLS += target