diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-22 23:31:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-22 23:31:41 -0800 |
| commit | 463541320dbb9a2863c77eff5b93e6075f5510f6 (patch) | |
| tree | 93890ba79d9e82d065c10384a6b3c5d3f896bcd2 | |
| parent | 27aa5a402fa1073a590aa408471161cb823ec0ee (diff) | |
| parent | 2cad8b53dd8bc6968de516aea97882219092e52f (diff) | |
| download | vcpkg-463541320dbb9a2863c77eff5b93e6075f5510f6.tar.gz vcpkg-463541320dbb9a2863c77eff5b93e6075f5510f6.zip | |
Merge pull request #5004 from krismattheus/master
[pthreads] add version resource and fix problem with PTW32_ARCH when compiling resource
| -rw-r--r-- | ports/pthreads/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/pthreads/CONTROL | 2 |
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 |