Skip to content

[vxl] Update to VXL v1.18.0 #4711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexkaratarakis merged 3 commits into from
Nov 15, 2018
Merged

[vxl] Update to VXL v1.18.0 #4711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62a2530
[vxl] Update to VXL v1.18.0
UnaNancyOwen Nov 12, 2018
13bb9a0
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
ras0219-msft Nov 14, 2018
802bc88
[vxl] Slight cleanup -- use VCPKG_CMAKE_SYSTEM_NAME to determine targ…
ras0219-msft Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ports/vxl/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Source: vxl
Version: 20180414-7a130cf-1
Build-Depends: zlib, tiff, expat, libpng, bzip2, libjpeg-turbo, shapelib, libgeotiff
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.
39 changes: 26 additions & 13 deletions ports/vxl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,42 @@
include(vcpkg_common_functions)

if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openjpeg.h")
message(FATAL_ERROR "Can't build VXL with non built-in OpenJpeg in current version. Please remove OpenJpeg, and try install VXL again.")
endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO vxl/vxl
REF 7a130cf05e907a6500e3e717297082c46e77f524
SHA512 b9f7e48e37b44469031c6de1bf2a3d0aa0ecf4d3c2f4dd0d1a84c273ca8a778b48f3caf7ec6ef0f2dea1dc534ebfdb6b2cde47a56d81aa4f0685114c0bda157c
REF v1.18.0
SHA512 6666d647b2e7010b91cb0b05016b5f49ae46d198f6bd160fe13fc09bc674eff5b937331fa11d81a8496473968b63452d950eee4fc2512152af57304a14bed63f
HEAD_REF master
)

set(USE_WIN_WCHAR_T OFF)
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(USE_WIN_WCHAR_T ON)
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DVXL_USING_NATIVE_ZLIB=ON
-DVXL_USING_NATIVE_BZLIB2=ON
-DVXL_USING_NATIVE_JPEG=ON
-DVXL_USING_NATIVE_TIFF=ON
-DVXL_USING_NATIVE_EXPAT=ON
-DVXL_USING_NATIVE_PNG=ON
-DVXL_USING_NATIVE_SHAPELIB=ON
-DVXL_USING_NATIVE_GEOTIFF=ON
-DVXL_FORCE_V3P_OPENJPEG2=ON
-DVXL_FORCE_V3P_J2K=ON
-DBUILD_TESTING=OFF
-DBUILD_EXAMPLES=OFF
-DBUILD_TESTING=OFF
-DVXL_FORCE_V3P_BZLIB2=OFF
-DVXL_USING_NATIVE_BZLIB2=TRUE # for disable build built-in bzip2 (v3p/bzlib/CMakeLists.txt#L10-L26)
-DVXL_FORCE_V3P_CLIPPER=ON # TODO : need add clipper port to turn off
-DVXL_FORCE_V3P_DCMTK=OFF
-DVXL_FORCE_V3P_GEOTIFF=OFF
-DVXL_FORCE_V3P_J2K=OFF
-DVXL_FORCE_V3P_JPEG=OFF
-DVXL_FORCE_V3P_OPENJPEG2=ON # TODO : need fix compile error when using openjpeg port to turn off
-DVXL_FORCE_V3P_PNG=OFF
-DVXL_FORCE_V3P_TIFF=OFF
-DVXL_FORCE_V3P_ZLIB=OFF
-DVXL_USE_DCMTK=OFF # TODO : need fix dcmtk support to turn on
-DXVL_USE_GEOTIFF=ON
-DVXL_USE_WIN_WCHAR_T=${USE_WIN_WCHAR_T}
)

vcpkg_install_cmake()
Expand Down