diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-05-27 06:42:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 21:42:12 -0700 |
| commit | 924eb894784f0256a6a2ca7796b3ee389a802afe (patch) | |
| tree | db7bd4dfaae25ab15d6885b77bc3abe94fe74500 /ports/gmp | |
| parent | 548822219352b55ca46dd75db683c06dcf45522a (diff) | |
| download | vcpkg-924eb894784f0256a6a2ca7796b3ee389a802afe.tar.gz vcpkg-924eb894784f0256a6a2ca7796b3ee389a802afe.zip | |
[gmp/nettle] try fixing build issues (#11565)
* [gmp/nettle] try fixing build issues
* [nettle/gmp] remove unnecessary comments
Diffstat (limited to 'ports/gmp')
| -rw-r--r-- | ports/gmp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/gmp/portfile.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/gmp/CONTROL b/ports/gmp/CONTROL index 54fe0fe2c..3f42c9d2a 100644 --- a/ports/gmp/CONTROL +++ b/ports/gmp/CONTROL @@ -1,5 +1,5 @@ Source: gmp
-Version: 6.2.0
+Version: 6.2.0-1
Homepage: https://gmplib.org/
Description: The GNU Multiple Precision Arithmetic Library
Build-Depends: vs-yasm (windows)
\ No newline at end of file diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index be12772d0..ee4b51c08 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -11,8 +11,7 @@ if(VCPKG_TARGET_IS_WINDOWS) )
vcpkg_find_acquire_program(YASM)
get_filename_component(YASM_DIR "${YASM}" DIRECTORY)
- vcpkg_add_to_path(${YASM_DIR})
- set(ENV{YASMPATH} ${YASM_DIR}/)
+ vcpkg_add_to_path("${YASM_DIR}")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(CONFIGURATION_RELEASE ReleaseDLL)
@@ -56,6 +55,7 @@ if(VCPKG_TARGET_IS_WINDOWS) RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE}
DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG}
SKIP_CLEAN
+ OPTIONS /p:UseEnv=True
)
get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME)
file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/include" "${CURRENT_PACKAGES_DIR}/include")
|