diff options
| author | Boris Pek <tehnick-8@yandex.ru> | 2017-03-26 22:03:43 (GMT) |
|---|---|---|
| committer | Boris Pek <tehnick-8@yandex.ru> | 2017-03-29 09:55:16 (GMT) |
| commit | 37d636f25853828832fef641ca711d356163fff7 (patch) | |
| tree | 530073df7287b5f012154fb8dc367c56ae613e85 | |
| parent | 946dbbec0f5dc5eb144b26b29da771e5dde37c69 (diff) | |
| download | mxe-37d636f25853828832fef641ca711d356163fff7.zip mxe-37d636f25853828832fef641ca711d356163fff7.tar.gz mxe-37d636f25853828832fef641ca711d356163fff7.tar.bz2 | |
qca: improve tests
| -rw-r--r-- | src/qca-test.pro | 4 | ||||
| -rw-r--r-- | src/qca.mk | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/qca-test.pro b/src/qca-test.pro index 0d4fb25..fb2cf81 100644 --- a/src/qca-test.pro +++ b/src/qca-test.pro @@ -1,8 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. TEMPLATE = app -greaterThan(QT_MAJOR_VERSION, 4): TARGET = test-qca5 -else: TARGET = test-qca +greaterThan(QT_MAJOR_VERSION, 4): TARGET = test-qca5-qmake +else: TARGET = test-qca-qmake SOURCES += qca-test.cpp CONFIG += crypto console QMAKE_CXXFLAGS += -Wall -Werror @@ -20,17 +20,18 @@ define $(PKG)_BUILD $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS) $(MAKE) -C '$(BUILD_DIR)' -j 1 install + # build test as qmake project $(if $(BUILD_SHARED), \ mkdir '$(BUILD_DIR)/test-qca' cd '$(BUILD_DIR)/test-qca' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qca-test.pro' $(MAKE) -C '$(BUILD_DIR)/test-qca' -j $(JOBS) $(BUILD_TYPE) - $(INSTALL) -m755 '$(BUILD_DIR)/test-qca/$(BUILD_TYPE)/test-qca5.exe' '$(PREFIX)/$(TARGET)/bin/') + $(INSTALL) -m755 '$(BUILD_DIR)/test-qca/$(BUILD_TYPE)/test-qca5-qmake.exe' '$(PREFIX)/$(TARGET)/bin/') - # compile test + # build test manually '$(TARGET)-g++' \ - -W -Wall -Werror \ - '$(SOURCE_DIR)/examples/base64test/base64test.cpp' \ - -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + -W -Wall -Werror -std=gnu++11 \ + '$(PWD)/src/qca-test.cpp' \ + -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \ `'$(TARGET)-pkg-config' qca2-qt5 --cflags --libs` endef |