diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-06-29 15:12:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-29 15:12:02 -0700 |
| commit | 70ab50f095880512d0d989c4f305cef4dbb8fbf2 (patch) | |
| tree | b1d7ad79a89fe11b81e24171fe809d2523c30efa | |
| parent | d2cb6411c5ea4b9540bd640bcc7ade8f7180a41b (diff) | |
| parent | 4edb857f3a274472e66b94f30a1f6834521038ad (diff) | |
Merge pull request #12635 from neheb/liblo
liblo: switch to CMake
| -rw-r--r-- | libs/liblo/Makefile | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/libs/liblo/Makefile b/libs/liblo/Makefile index 8a5b20f14..20d553695 100644 --- a/libs/liblo/Makefile +++ b/libs/liblo/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liblo PKG_VERSION:=0.31 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/liblo @@ -19,10 +19,13 @@ PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING -PKG_INSTALL:=1 +CMAKE_INSTALL:=1 +CMAKE_SOURCE_SUBDIR:=cmake PKG_BUILD_PARALLEL:=1 +PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_liblo-utils include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk define Package/liblo/Default TITLE:=Lightweight Open Sound Control (OSC) @@ -45,21 +48,13 @@ $(call Package/liblo/Default) DEPENDS:= +liblo endef -CONFIGURE_ARGS += \ - $(if $(CONFIG_IPV6),--enable,--disable)-ipv6 \ - --enable-threads \ - --disable-examples \ - --disable-network-tests \ - --disable-tests - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/lo $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblo.* $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/liblo.pc $(1)/usr/lib/pkgconfig/ -endef +CMAKE_OPTIONS += \ + -DWITH_TOOLS=O$(if $(CONFIG_PACKAGE_liblo-utils),N,FF) \ + -DWITH_TESTS=OFF \ + -DWITH_EXAMPLES=OFF \ + -DWITH_CPP_TESTS=OFF \ + -DWITH_STATIC=OFF \ + -DTHREADING=ON define Package/liblo/install $(INSTALL_DIR) $(1)/usr/lib |