diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2020-10-12 20:04:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 12:04:28 -0700 |
| commit | d21e8c0644399531068733eb08ad11946e4c20b3 (patch) | |
| tree | 0b0369a36266b333ef5d0669bb00621217f7a834 | |
| parent | 45fa57c276f894a0563abb854e319a88ddb7105c (diff) | |
| download | vcpkg-d21e8c0644399531068733eb08ad11946e4c20b3.tar.gz vcpkg-d21e8c0644399531068733eb08ad11946e4c20b3.zip | |
[opencl] fix crt linkage for x64-windows-static-md (#13977)
* [opencl] fix crt linkage
* [opencl] bump port version
* [opencl] minor simplification in portfile
Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>
Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>
| -rw-r--r-- | ports/opencl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/opencl/portfile.cmake | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ports/opencl/CONTROL b/ports/opencl/CONTROL index 41069be82..e554fe5ee 100644 --- a/ports/opencl/CONTROL +++ b/ports/opencl/CONTROL @@ -1,6 +1,6 @@ Source: opencl Version: 2.2 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/KhronosGroup/OpenCL-Headers Description: C/C++ headers and ICD loader (Installable Client Driver) for OpenCL diff --git a/ports/opencl/portfile.cmake b/ports/opencl/portfile.cmake index e7b5e132a..dc1ea069c 100644 --- a/ports/opencl/portfile.cmake +++ b/ports/opencl/portfile.cmake @@ -60,12 +60,15 @@ vcpkg_from_github( 0001-include-unistd-for-gete-ug-id.patch ) +string(COMPARE EQUAL ${VCPKG_CRT_LINKAGE} dynamic USE_DYNAMIC_VCXX_RUNTIME) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DOPENCL_ICD_LOADER_HEADERS_DIR=${CURRENT_PACKAGES_DIR}/include -DOPENCL_ICD_LOADER_REQUIRE_WDK=${WITH_WDK} + -DUSE_DYNAMIC_VCXX_RUNTIME=${USE_DYNAMIC_VCXX_RUNTIME} ) vcpkg_build_cmake(TARGET OpenCL) |