From e6d1f16038824274a8797f2bff1179c178eee23c Mon Sep 17 00:00:00 2001 From: atkawa7 Date: Wed, 28 Jun 2017 16:12:00 -0700 Subject: [PATCH] use CMake's autoexport --- ports/speex/CMakeLists.txt | 5 +---- ports/speex/portfile.cmake | 6 ------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ports/speex/CMakeLists.txt b/ports/speex/CMakeLists.txt index eff1d585a7..839222ae6f 100644 --- a/ports/speex/CMakeLists.txt +++ b/ports/speex/CMakeLists.txt @@ -1,10 +1,6 @@ cmake_minimum_required (VERSION 3.8.0) project (libspeex C) -if(BUILD_SHARED_LIBS) - message(FATAL_ERROR "This CMake buildsystem only supports static builds") -endif() - set(COMMON_INCLUDES ${PROJECT_BINARY_DIR}/include) option(USE_SSE "USE_SSE used Note: USE_SSE and FIXED_POINT are mutually exclusive." ON) @@ -56,6 +52,7 @@ set(SRC "libspeex/vbr.c" "libspeex/vq.c" "libspeex/window.c" + "win32/libspeex.def" ) add_library(libspeex ${SRC}) diff --git a/ports/speex/portfile.cmake b/ports/speex/portfile.cmake index 75841d7d03..f6d2108e01 100644 --- a/ports/speex/portfile.cmake +++ b/ports/speex/portfile.cmake @@ -1,11 +1,5 @@ include(vcpkg_common_functions) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(STATUS "Speex doesn't support visibility on Win32 yet. Building static.") - message(STATUS "See https://github.com/xiph/speex/blob/master/win32/config.h for more") - set(VCPKG_LIBRARY_LINKAGE static) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/speex