[vxl] Slight cleanup -- use VCPKG_CMAKE_SYSTEM_NAME to determine target instead of WIN32

This commit is contained in:
Robert Schumacher 2018-11-14 11:28:02 -08:00
parent 13bb9a0f02
commit 802bc881f5
2 changed files with 2 additions and 5 deletions

View File

@ -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.

View File

@ -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