Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit 1f8b80b

Browse files
committed
improve static lib handling and ios install
1 parent 5a5ae12 commit 1f8b80b

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/3rdparty/cryptopp/cryptopp.pri

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ system_cryptopp:unix {
1212
INCLUDEPATH += $$PWD/include
1313
DEPENDPATH += $$PWD/include
1414

15-
win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/lib/cryptlib.lib
16-
else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/lib/cryptlibd.lib
17-
else: PRE_TARGETDEPS += $$PWD/lib/libcryptopp.a
15+
win32:!win32-g++:CONFIG(release, debug|release): CRYPTOPP_LIBFILE = $$PWD/lib/cryptlib.lib
16+
else:win32:!win32-g++:CONFIG(debug, debug|release): CRYPTOPP_LIBFILE = $$PWD/lib/cryptlibd.lib
17+
else: CRYPTOPP_LIBFILE = $$PWD/lib/libcryptopp.a
18+
PRE_TARGETDEPS += $$CRYPTOPP_LIBFILE
1819

1920
win32: DEFINES += QTDATASYNC_OSRNG_OVERWRITE
2021
}

src/messages/messages.pro

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
TEMPLATE = lib
22

3-
CONFIG += staticlib
4-
win32|darwin: CONFIG += debug_and_release build_all
3+
CONFIG += static
54

5+
load(qt_helper_lib)
6+
CONFIG += qt warning_clean
67
QT = core
78

8-
DESTDIR = $$shadowed($$dirname(_QMAKE_CONF_))/lib
9-
TARGET = $$qtLibraryTarget(qtdatasync-messages)
9+
TARGET = qtdatasync-messages
1010

1111
DEFINES += QT_BUILD_DATASYNC_LIB #is build as part of the lib regarding exports
1212

@@ -58,6 +58,10 @@ SOURCES += \
5858

5959
include(../3rdparty/cryptopp/cryptopp.pri)
6060

61+
cryptopp_lib.files += $$CRYPTOPP_LIBFILE
62+
cryptopp_lib.path = $${target.path}
63+
qtConfig(static): INSTALLS += cryptopp_lib
64+
6165
# dummy target, translations are all done in datasync
6266
QMAKE_EXTRA_TARGETS += lrelease
6367

0 commit comments

Comments
 (0)