diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/arb | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/arb')
| -rw-r--r-- | ports/arb/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | ports/arb/CONTROL | 8 | ||||
| -rw-r--r-- | ports/arb/portfile.cmake | 7 |
3 files changed, 9 insertions, 19 deletions
diff --git a/ports/arb/CMakeLists.txt b/ports/arb/CMakeLists.txt index 3474c9974..300c2003b 100644 --- a/ports/arb/CMakeLists.txt +++ b/ports/arb/CMakeLists.txt @@ -5,7 +5,7 @@ project(arb C) set (DEPS mpir mpfr pthreads flint2 gettimeofday) set (mpir_lib gmp mpir) set (mpfr_lib mpfr) -set (pthreads_lib pthreads pthread) +set (pthreads_lib pthreads pthread pthreadVC2 pthreadVC3) set (flint2_lib ${LIBRARY_TYPE}_flint flint) set (gettimeofday_lib gettimeofday) @@ -55,14 +55,8 @@ include_directories(BEFORE ${DEP_INCLUDE_DIRS}) add_library(arb ${SRC}) target_compile_definitions(arb PRIVATE HAVE_TLS=1 FLINT_REENTRANT=0) -if (BUILD_SHARED_LIBS) - target_compile_definitions(arb PRIVATE MSC_USE_DLL) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS yes) - MESSAGE( STATUS "Building shared libraries" ) -else () - target_compile_definitions(arb PRIVATE PTW32_STATIC_LIB) - MESSAGE( STATUS "Building static libraries" ) -endif() +target_compile_definitions(arb PRIVATE PTW32_STATIC_LIB) +MESSAGE( STATUS "Building static libraries" ) target_compile_definitions(arb PRIVATE "ARB_BUILD_DLL") target_link_libraries(arb ${DEPS}) @@ -91,4 +85,3 @@ if (BUILD_TESTS) endforeach () endforeach () endif () - diff --git a/ports/arb/CONTROL b/ports/arb/CONTROL index 2166fd1e0..540eedaee 100644 --- a/ports/arb/CONTROL +++ b/ports/arb/CONTROL @@ -1,4 +1,4 @@ -Source: arb -Version: 2.11.1 -Description: a C library for arbitrary-precision interval arithmetic -Build-Depends: flint +Source: arb
+Version: 2.11.1-2
+Description: a C library for arbitrary-precision interval arithmetic
+Build-Depends: flint
diff --git a/ports/arb/portfile.cmake b/ports/arb/portfile.cmake index 32bb3a23b..847120318 100644 --- a/ports/arb/portfile.cmake +++ b/ports/arb/portfile.cmake @@ -1,10 +1,7 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(STATUS "Warning: Dynamic building not supported yet. Building static.") - set(VCPKG_LIBRARY_LINKAGE static) -endif() - include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fredrik-johansson/arb |