qca: cosmetic changes

pull/1709/head
Boris Pek 7 years ago
parent ca1a94bb9e
commit e18f93945a

@ -19,4 +19,3 @@ if(BUILD_STATIC_LIBS)
endif(BUILD_STATIC_LIBS) endif(BUILD_STATIC_LIBS)
install(TARGETS ${TGT} DESTINATION bin) install(TARGETS ${TGT} DESTINATION bin)

@ -21,17 +21,17 @@ define $(PKG)_BUILD
$(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MAKE) -C '$(BUILD_DIR)' -j 1 install
# build test as qmake project # build test as qmake project
mkdir '$(BUILD_DIR)/test-qca' mkdir '$(BUILD_DIR).test-qmake'
cd '$(BUILD_DIR)/test-qca' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qca-test.pro' cd '$(BUILD_DIR).test-qmake' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qca-test.pro'
$(MAKE) -C '$(BUILD_DIR)/test-qca' -j $(JOBS) $(BUILD_TYPE) $(MAKE) -C '$(BUILD_DIR).test-qmake' -j 1
$(INSTALL) -m755 '$(BUILD_DIR)/test-qca/$(BUILD_TYPE)/test-qca-qmake.exe' '$(PREFIX)/$(TARGET)/bin/' $(INSTALL) -m755 '$(BUILD_DIR).test-qmake/$(BUILD_TYPE)/test-qca-qmake.exe' '$(PREFIX)/$(TARGET)/bin/'
# build test as cmake project # build test as cmake project
mkdir '$(1).test-cmake' mkdir '$(BUILD_DIR).test-cmake'
cd '$(1).test-cmake' && $(TARGET)-cmake \ cd '$(BUILD_DIR).test-cmake' && $(TARGET)-cmake \
-DPKG=$(PKG) \ -DPKG=$(PKG) \
'$(PWD)/src/cmake/test' '$(PWD)/src/cmake/test'
$(MAKE) -C '$(1).test-cmake' -j 1 install VERBOSE=ON $(MAKE) -C '$(BUILD_DIR).test-cmake' -j 1 install VERBOSE=ON
# build test manually # build test manually
'$(TARGET)-g++' \ '$(TARGET)-g++' \
@ -41,4 +41,3 @@ define $(PKG)_BUILD
$(if $(BUILD_STATIC), -L'$(PREFIX)/$(TARGET)/qt5/plugins/crypto' -lqca-ossl) \ $(if $(BUILD_STATIC), -L'$(PREFIX)/$(TARGET)/qt5/plugins/crypto' -lqca-ossl) \
`'$(TARGET)-pkg-config' qca2-qt5 --cflags --libs` `'$(TARGET)-pkg-config' qca2-qt5 --cflags --libs`
endef endef

Loading…
Cancel
Save