From de1aefad43ee798f07a8436e2faddd1ae634f4f0 Mon Sep 17 00:00:00 2001 From: Igor Bezzubchenko Date: Sat, 2 Jan 2021 22:08:18 +0300 Subject: [PATCH] libpqxx: fixed review comments Removed PKG_INSTALL Capitalized options Use inline `if` instead of blocks Signed-off-by: Igor Bezzubchenko --- libs/libpqxx/Makefile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libs/libpqxx/Makefile b/libs/libpqxx/Makefile index a9789a74be..87ee10aa90 100644 --- a/libs/libpqxx/Makefile +++ b/libs/libpqxx/Makefile @@ -3,7 +3,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpqxx PKG_VERSION:=7.3.0 PKG_RELEASE:=1 -PKG_INSTALL:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/jtv/libpqxx @@ -31,15 +30,13 @@ define Package/libpqxx/config endef CMAKE_OPTIONS += \ - -DBUILD_DOC=off \ - $(if $(CONFIG_LIBPQXX_STATIC), -DBUILD_STATIC_LIBS=on) \ - $(if $(CONFIG_LIBPQXX_SHARED), -DBUILD_SHARED_LIBS=on) - -ifeq ($(CONFIG_LIBPQXX_INSTALL_TEST),y) - CMAKE_OPTIONS += -DINSTALL_TEST=on -DSKIP_BUILD_TEST=off -else - CMAKE_OPTIONS += -DINSTALL_TEST=off -DSKIP_BUILD_TEST=on -endif + -DBUILD_DOC=OFF \ + -DBUILD_STATIC_LIBS=O$(if $(CONFIG_LIBPQXX_STATIC),N,FF) \ + -DBUILD_SHARED_LIBS=O$(if $(CONFIG_LIBPQXX_SHARED),N,FF) \ + $(if $(CONFIG_LIBPQXX_INSTALL_TEST),\ + -DINSTALL_TEST=ON -DSKIP_BUILD_TEST=OFF, \ + -DINSTALL_TEST=OFF -DSKIP_BUILD_TEST=ON \ + ) define Package/libpqxx/install $(INSTALL_DIR) $(1)/usr/lib -- 2.30.2