aboutsummaryrefslogtreecommitdiff
path: root/ports/tinythread
diff options
context:
space:
mode:
authorThad House <thadhouse1@gmail.com>2019-05-31 13:49:13 -0700
committerThad House <thadhouse1@gmail.com>2019-05-31 13:49:13 -0700
commit788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch)
tree173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/tinythread
parentf483ae4c7fd04eed671a1de595374f84175311e9 (diff)
parent26a9338c5055193915290527eacb37f2ac7fdcb8 (diff)
downloadvcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz
vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip
Merge master
Diffstat (limited to 'ports/tinythread')
-rw-r--r--ports/tinythread/CMakeLists.txt4
-rw-r--r--ports/tinythread/CONTROL6
-rw-r--r--ports/tinythread/portfile.cmake3
3 files changed, 6 insertions, 7 deletions
diff --git a/ports/tinythread/CMakeLists.txt b/ports/tinythread/CMakeLists.txt
index ec8b3634c..57e972132 100644
--- a/ports/tinythread/CMakeLists.txt
+++ b/ports/tinythread/CMakeLists.txt
@@ -6,10 +6,6 @@ if(MSVC)
add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
endif()
-if(BUILD_SHARED_LIBS)
- set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
include_directories(source)
add_library(tinythread source/tinythread.cpp)
diff --git a/ports/tinythread/CONTROL b/ports/tinythread/CONTROL
index d438e8721..6b5de12e1 100644
--- a/ports/tinythread/CONTROL
+++ b/ports/tinythread/CONTROL
@@ -1,3 +1,3 @@
-Source: tinythread
-Version: 1.1-1
-Description: Implements a fairly compatible subset of the C++11 thread management classes
+Source: tinythread
+Version: 1.1-2
+Description: Implements a fairly compatible subset of the C++11 thread management classes
diff --git a/ports/tinythread/portfile.cmake b/ports/tinythread/portfile.cmake
index 23903e30e..550a192bc 100644
--- a/ports/tinythread/portfile.cmake
+++ b/ports/tinythread/portfile.cmake
@@ -1,4 +1,7 @@
include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/TinyThread++-1.1")
vcpkg_download_distfile(ARCHIVE
URLS "http://tinythreadpp.bitsnbites.eu/files/TinyThread%2B%2B-1.1-src.tar.bz2"