diff options
| author | Luiz Paulo <lp55@visum.pt> | 2017-11-11 15:31:38 +0000 |
|---|---|---|
| committer | Luiz Paulo M. Pires <lp55@visum.pt> | 2017-11-11 15:31:38 +0000 |
| commit | 72f10db01caf7dfa0e8c14c4256401b3f4ea70a2 (patch) | |
| tree | 194d72c20afc2cffd4cc35357d55d1e52e24a6b9 | |
| parent | 50f6bc4e8f103c695f8754962dde0be03e32cbc5 (diff) | |
| download | vcpkg-72f10db01caf7dfa0e8c14c4256401b3f4ea70a2.tar.gz vcpkg-72f10db01caf7dfa0e8c14c4256401b3f4ea70a2.zip | |
Adding package features for Dlib and OpenCV
Dlib - Package feature for blas (dlib is compatiable with Intel MKL) and CUDA
OpenCV - Added option to integrate GDCM support (to read DICOM files)
| -rw-r--r-- | ports/dlib/CONTROL | 7 | ||||
| -rw-r--r-- | ports/dlib/portfile.cmake | 15 | ||||
| -rw-r--r-- | ports/opencv/CONTROL | 4 | ||||
| -rw-r--r-- | ports/opencv/portfile.cmake | 6 |
4 files changed, 29 insertions, 3 deletions
diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL index 87d81875b..c773d8d28 100644 --- a/ports/dlib/CONTROL +++ b/ports/dlib/CONTROL @@ -2,3 +2,10 @@ Source: dlib Version: 19.7 Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3 Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ + +Feature: blas +Description: BLAS support for dlib + +Feature: cuda +Build-Depends: cuda +Description: CUDA support for dlib diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index 4234e3e4b..e80176b7d 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -17,6 +17,16 @@ file(READ "${SOURCE_PATH}/dlib/CMakeLists.txt" DLIB_CMAKE) string(REPLACE "PNG_LIBRARY" "PNG_LIBRARIES" DLIB_CMAKE "${DLIB_CMAKE}") file(WRITE "${SOURCE_PATH}/dlib/CMakeLists.txt" "${DLIB_CMAKE}") +set(WITH_BLAS OFF) +if("blas" IN_LIST FEATURES) + set(WITH_BLAS ON) +endif() + +set(WITH_CUDA OFF) +if("cuda" IN_LIST FEATURES) + set(WITH_CUDA ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -25,12 +35,11 @@ vcpkg_configure_cmake( -DDLIB_USE_FFTW=ON -DDLIB_PNG_SUPPORT=ON -DDLIB_JPEG_SUPPORT=ON - -DDLIB_USE_BLAS=OFF + -DDLIB_USE_BLAS=${WITH_BLAS} -DDLIB_USE_LAPACK=OFF - -DDLIB_USE_CUDA=OFF + -DDLIB_USE_CUDA=${WITH_CUDA} -DDLIB_GIF_SUPPORT=OFF -DDLIB_USE_MKL_FFT=OFF - #-DDLIB_USE_CUDA=ON OPTIONS_DEBUG -DDLIB_ENABLE_ASSERTS=ON #-DDLIB_ENABLE_STACK_TRACE=ON diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 2654e5a25..d41323609 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -21,3 +21,7 @@ Description: Qt GUI support for opencv Feature: vtk Build-Depends: vtk Description: vtk support for opencv + +Feature: gdcm +Build-Depends: gdcm2 +Description: GDCM support for opencv diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index f514e189e..b6958abfd 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -58,6 +58,11 @@ if("vtk" IN_LIST FEATURES) set(WITH_VTK ON) endif() +set(WITH_GDCM OFF) +if("gdcm" IN_LIST FEATURES) + set(WITH_GDCM ON) +endif() + set(WITH_MSMF ON) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(WITH_MSMF OFF) @@ -112,6 +117,7 @@ vcpkg_configure_cmake( -DWITH_OPENGL=ON -DWITH_QT=${WITH_QT} -DWITH_VTK=${WITH_VTK} + -DWITH_GDCM=${WITH_GDCM} OPTIONS_DEBUG -DINSTALL_HEADERS=OFF -DINSTALL_OTHER=OFF |