diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-11-14 11:28:02 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-11-14 11:28:02 -0800 |
| commit | 802bc881f5725e4946329f51163747c880b7c267 (patch) | |
| tree | 412315e486a78844bb2b6bb66d0362cd907e6578 | |
| parent | 13bb9a0f0216cd2899279b566b6a4aaf5246740a (diff) | |
| download | vcpkg-802bc881f5725e4946329f51163747c880b7c267.tar.gz vcpkg-802bc881f5725e4946329f51163747c880b7c267.zip | |
[vxl] Slight cleanup -- use VCPKG_CMAKE_SYSTEM_NAME to determine target instead of WIN32
| -rw-r--r-- | ports/vxl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/vxl/portfile.cmake | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/ports/vxl/CONTROL b/ports/vxl/CONTROL index bb187ed71..d9340d9f3 100644 --- a/ports/vxl/CONTROL +++ b/ports/vxl/CONTROL @@ -1,5 +1,5 @@ Source: vxl -Version: v1.18.0-1 +Version: v1.18.0-2 Build-Depends: bzip2, libgeotiff, libjpeg-turbo, libpng, tiff, zlib, expat, shapelib # Build-Depends: bzip2, dcmtk, libgeotiff, libjpeg-turbo, openjpeg, libpng, tiff, zlib Description: A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding. diff --git a/ports/vxl/portfile.cmake b/ports/vxl/portfile.cmake index 89a82219c..75d89ee2d 100644 --- a/ports/vxl/portfile.cmake +++ b/ports/vxl/portfile.cmake @@ -12,10 +12,8 @@ vcpkg_from_github( HEAD_REF master ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS) - set(USE_WIN_WCHAR_T OFF) -if(WIN32) +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(USE_WIN_WCHAR_T ON) endif() @@ -23,7 +21,6 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DBUILD_SHARED_LIBS=${VXL_SHARED_LIBS} -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DVXL_FORCE_V3P_BZLIB2=OFF |