aboutsummaryrefslogtreecommitdiff
path: root/ports/pthreads
diff options
context:
space:
mode:
authorGriffin Downs <grdowns@microsoft.com>2019-02-27 16:44:17 -0800
committerGriffin Downs <grdowns@microsoft.com>2019-02-27 16:44:17 -0800
commit1908903508bf057ad05d8a344e5bc55477944cb6 (patch)
tree2a23595f1e7d8cc9a6358bfd44a00eb7368d8a1b /ports/pthreads
parentb0a2ff18c9f2c9131aed131f5bf0d97c0e23da8e (diff)
parent8564602d06d7c4ce236f96a4f0f3ba7c2d769cb0 (diff)
downloadvcpkg-1908903508bf057ad05d8a344e5bc55477944cb6.tar.gz
vcpkg-1908903508bf057ad05d8a344e5bc55477944cb6.zip
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/4802
Diffstat (limited to 'ports/pthreads')
-rw-r--r--ports/pthreads/CMakeLists.txt4
-rw-r--r--ports/pthreads/CONTROL2
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/pthreads/CMakeLists.txt b/ports/pthreads/CMakeLists.txt
index 7ae6bcc34..70317b460 100644
--- a/ports/pthreads/CMakeLists.txt
+++ b/ports/pthreads/CMakeLists.txt
@@ -28,6 +28,7 @@ set(PTHREAD_SHARED_SOURCES
sync.c
tsd.c
attr.C
+ version.rc
)
set(PTHREAD_STATIC_SOURCES
autostatic.c
@@ -169,8 +170,7 @@ set(PTHREAD_STATIC_SOURCES
-option(PTW32_ARCH "x32")
-add_definitions(-DPTW32_ARCH=${PTW32_ARCH} -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED)
+add_definitions(-DPTW32_ARCH="${PTW32_ARCH}" -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED)
if(BUILD_SHARED_LIBS)
set(PTHREAD_SOURCES ${PTHREAD_SHARED_SOURCES})
diff --git a/ports/pthreads/CONTROL b/ports/pthreads/CONTROL
index ab02fb415..53b710f2a 100644
--- a/ports/pthreads/CONTROL
+++ b/ports/pthreads/CONTROL
@@ -1,3 +1,3 @@
Source: pthreads
-Version: 2.9.1-2
+Version: 2.9.1-3
Description: pthreads for windows