aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-03-14 10:55:07 -0700
committerRobert Schumacher <roschuma@microsoft.com>2018-03-14 10:55:07 -0700
commit4fb24d20ad848c37c9968d8bb7609c7790e27aef (patch)
tree1ec2b941c6520dd1fac52e4431901c927a4ef8c2
parentc5f93055a09629247236d1d7dca2c4aa9c1de7c9 (diff)
downloadvcpkg-4fb24d20ad848c37c9968d8bb7609c7790e27aef.tar.gz
vcpkg-4fb24d20ad848c37c9968d8bb7609c7790e27aef.zip
[jemalloc] Fix corrupted patchfile
-rw-r--r--ports/jemalloc/fix-cmakelists.patch2
-rw-r--r--ports/jemalloc/portfile.cmake1
2 files changed, 2 insertions, 1 deletions
diff --git a/ports/jemalloc/fix-cmakelists.patch b/ports/jemalloc/fix-cmakelists.patch
index a19cb4050..3ba70544c 100644
--- a/ports/jemalloc/fix-cmakelists.patch
+++ b/ports/jemalloc/fix-cmakelists.patch
@@ -35,7 +35,7 @@ index 06e83ef..229e17a 100644
${PROJECT_BINARY_DIR}/Debug
CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE
@@ -754,6 +752,9 @@ if(WIN32)
- COMPILE_PDB_NAME
+ COMPILE_PDB_NAME
${LIBJEMALLOCLIB}
)
+ if(NOT BUILD_SHARED_LIBS)
diff --git a/ports/jemalloc/portfile.cmake b/ports/jemalloc/portfile.cmake
index 3fe6fdbb7..527891666 100644
--- a/ports/jemalloc/portfile.cmake
+++ b/ports/jemalloc/portfile.cmake
@@ -20,6 +20,7 @@ vcpkg_apply_patches(
)
vcpkg_configure_cmake(
+ DISABLE_PARALLEL_CONFIGURE
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DGIT_FOUND=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON