diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-10-15 22:10:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 22:10:32 -0700 |
| commit | 75b4620da5c201d577426aafe101ecb045e7411b (patch) | |
| tree | 13c1d87fc5b6488615a6db101e4fd532b5192d48 | |
| parent | 17365b43a4d0f803fa9f5bb0009de1d9aa85e11c (diff) | |
| parent | c0e4ce598ff3684d1e95f811c0e2755f8ba3539d (diff) | |
| download | vcpkg-75b4620da5c201d577426aafe101ecb045e7411b.tar.gz vcpkg-75b4620da5c201d577426aafe101ecb045e7411b.zip | |
Merge pull request #8554 from NancyLi1013/dev/NancyLi/8539-add-feature-for-vtk
[vtk] Change atlmfc as feature
| -rw-r--r-- | ports/vtk/CONTROL | 8 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 42 |
2 files changed, 14 insertions, 36 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index e4f771407..990e2aa32 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,8 +1,8 @@ Source: vtk -Version: 8.2.0-8 +Version: 8.2.0-9 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK -Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c Feature: openvr Description: OpenVR functionality for VTK @@ -19,3 +19,7 @@ Build-Depends: mpi, hdf5[parallel] Feature: python Description: Python functionality for VTK Build-Depends: python3 + +Feature: atlmfc +Description: Mfc functionality for vtk on Windows +Build-Depends: atlmfc (windows)
\ No newline at end of file diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 472c06b4b..e487d879e 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -8,30 +8,13 @@ set(VTK_SHORT_VERSION "8.2") set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.0") # ============================================================================= # Options: - -if ("qt" IN_LIST FEATURES) - set(VTK_WITH_QT ON ) -else() - set(VTK_WITH_QT OFF ) -endif() - -if ("mpi" IN_LIST FEATURES) - set(VTK_Group_MPI ON) -else() - set(VTK_Group_MPI OFF) -endif() - -if ("python" IN_LIST FEATURES) - set(VTK_WITH_PYTHON ON) -else() - set(VTK_WITH_PYTHON OFF) -endif() - -if("openvr" IN_LIST FEATURES) - set(Module_vtkRenderingOpenVR ON) -else() - set(Module_vtkRenderingOpenVR OFF) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + qt VTK_WITH_QT + mpi VTK_Group_MPI + python VTK_WITH_PYTHON + openvr Module_vtkRenderingOpenVR + atlmfc Module_vtkGUISupportMFC +) set(VTK_WITH_ALL_MODULES OFF) # IMPORTANT: if ON make sure `qt5`, `mpi`, `python3`, `ffmpeg`, `gdal`, `fontconfig`, # `libmysql` and `atlmfc` are listed as dependency in the CONTROL file @@ -97,19 +80,13 @@ if(VTK_WITH_ALL_MODULES) ) endif() -if(NOT VCPKG_CMAKE_SYSTEM_NAME) - set(Module_vtkGUISupportMFC ON) -else() - set(Module_vtkGUISupportMFC OFF) -endif() - # ============================================================================= # Configure & Install vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS + OPTIONS ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DVTK_INSTALL_INCLUDE_DIR=include @@ -126,9 +103,6 @@ vcpkg_configure_cmake( # Select modules / groups to install -DVTK_Group_Imaging=ON -DVTK_Group_Views=ON - -DModule_vtkGUISupportMFC=${Module_vtkGUISupportMFC} - -DModule_vtkRenderingOpenVR=${Module_vtkRenderingOpenVR} - -DVTK_Group_MPI=${VTK_Group_MPI} -DPYTHON_EXECUTABLE=${PYTHON3} ${ADDITIONAL_OPTIONS} |