aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoratkawa7 <atkawa7@yahoo.com>2017-06-28 16:12:00 -0700
committeratkawa7 <atkawa7@yahoo.com>2017-06-28 16:12:00 -0700
commite6d1f16038824274a8797f2bff1179c178eee23c (patch)
tree84d0a804517afda95a6f2ff898feafc2d4c102b9
parent76ca4cb60e75ed30357dc7d91e6f803146f78684 (diff)
downloadvcpkg-e6d1f16038824274a8797f2bff1179c178eee23c.tar.gz
vcpkg-e6d1f16038824274a8797f2bff1179c178eee23c.zip
use CMake's autoexport
-rw-r--r--ports/speex/CMakeLists.txt5
-rw-r--r--ports/speex/portfile.cmake6
2 files changed, 1 insertions, 10 deletions
diff --git a/ports/speex/CMakeLists.txt b/ports/speex/CMakeLists.txt
index eff1d585a..839222ae6 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 75841d7d0..f6d2108e0 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