mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 18:29:01 +08:00
9e36a44338
* [cgns] update to 4.2.0 * [vtk-m] update to 1.6.0 * [vtk] Update to 9.0.1-pv5.9.1 - VTK update to match release version of ParaView * [ParaView] Update to 5.9.1 * version stuff * fix automatic svg linkage in static builds * update qt5-svg * revisit vtk - fix build with vtk-m 1.6 - remove unused patches - remove comments * bump version * remove two commented lines * version stuff * remove old PR version * commit stuff * commit stuff * update notes * wip commit * update paraview * fix hdf5 patch * fix patch * fix patch * fix portfile * add mpi feature * format manifest * use relativ path * trace * retry * move qml files again * try with host triplet * - use VCPKG_CRT_LINKAGE - use METIS not metis * fix casing Zlib * hopefully more fixes on other platforms. * fix patch * fix missing ws * fix typos * scale down to warning * revert jsoncpp change fix zoltan on osx? * move trace option to failing port * move trace option to failing port * Revert "trilinos vcpkg.json changes" * verdict fix osx build ? * fix patch * fix internal find_package call * also apply correct case for metis * disable METIS on osx * vtk-m don't support arm. * force more features in Ci * fix missing , * more fixes * more vtk python try and error. * - paraview python setup same as vtk - remove openvr from platforms not supporting it - trace openimageio * fix case and remove fmt for openimageio. * trying to fix stuff * set hash to 0 * [skip actions] add missing module * WebCore module moved to paraview&python * fixes * remove patch in vtk-dicom * add var to maybe unused * use correct 5.11 ref instead of the one in release * Patch cleanup round 1 * remove empty patch parts * fix vtkm configs * reintegrate jsoncpp.patch * fix patch * add single seacas/kokkos/zoltan ports * throw out trilinos, zoltan, kokkos replace trilinos with seacas make seacas work for dynamic windows * fix mpi feature * fix dependency * retry dep fix * rename target * remove double line * fix target * fix patch * retry * remove cgns config * fix cgns * no seacas trace * lowercase hdf5 target * fix case of metis * disable Fortran * add iotr patch * add additional config folder * handel case sensitive Seacas again * get trace again and force jsoncpp * update cmake to 3.25.0 * bump port-version * add patch from vtk upstream * cleanup, format-manifest * fix port version * v db * opencv4 always inject deps. * fix test port to not require stuff which is not supported on x86 * Fix HDF5 lookup in opencv4 * only delete bin folder in static builds * add license field * v db * add missing " * v db * trace again * fix rtabmap python dep * fix openimageio by deleting the find module * v db * cr cleanup * v db * opencv4 v db due to merge with master. Had to bump port version * v db * v db * v db * CR comments * v db for cr comments * trace theia output * revert theia trace * v db * try without patch * revert rtabmap changes * v db after merge * v db for all
107 lines
3.2 KiB
Diff
107 lines
3.2 KiB
Diff
diff --git a/CMake/FindCGNS.cmake b/CMake/FindCGNS.cmake
|
|
index 005f1afd9..35c6de184 100644
|
|
--- a/CMake/FindCGNS.cmake
|
|
+++ b/CMake/FindCGNS.cmake
|
|
@@ -1,48 +1,53 @@
|
|
-#
|
|
-# Find the native CGNS includes and library
|
|
-#
|
|
-# CGNS_INCLUDE_DIR - where to find cgns.h, etc.
|
|
-# CGNS_LIBRARIES - List of fully qualified libraries to link against when using CGNS.
|
|
-# CGNS_FOUND - Do not attempt to use CGNS if "no" or undefined.
|
|
-
|
|
-find_path(CGNS_INCLUDE_DIR
|
|
- NAMES
|
|
- cgnslib.h
|
|
- PATHS
|
|
- /usr/local/include
|
|
- /usr/include
|
|
- DOC "CGNS include directory")
|
|
-mark_as_advanced(CGNS_INCLUDE_DIR)
|
|
-
|
|
-find_library(CGNS_LIBRARY
|
|
- NAMES
|
|
- cgns
|
|
- DOC "CGNS library")
|
|
-mark_as_advanced(CGNS_LIBRARY)
|
|
-
|
|
-if (CGNS_INCLUDE_DIR)
|
|
- file(STRINGS "${CGNS_INCLUDE_DIR}/cgnslib.h" version
|
|
- REGEX "CGNS_DOTVERS")
|
|
- string(REGEX REPLACE ".*CGNS_DOTVERS *\([0-9.]*\).*" "\\1" CGNS_VERSION "${version}")
|
|
- unset(version)
|
|
-else ()
|
|
- set(CGNS_VERSION CGNS_VERSION-NOTFOUND)
|
|
-endif ()
|
|
-
|
|
-# handle the QUIETLY and REQUIRED arguments and set CGNS_FOUND to TRUE if
|
|
-# all listed variables are TRUE
|
|
-include(FindPackageHandleStandardArgs)
|
|
-find_package_handle_standard_args(CGNS
|
|
- REQUIRED_VARS CGNS_INCLUDE_DIR CGNS_LIBRARY
|
|
- VERSION_VAR CGNS_VERSION)
|
|
-
|
|
-if (CGNS_FOUND)
|
|
- set(CGNS_LIBRARIES "${CGNS_LIBRARY}")
|
|
- set(CGNS_INCLUDE_DIRS "${CGNS_INCLUDE_DIR}")
|
|
- if (NOT TARGET CGNS::CGNS)
|
|
- add_library(CGNS::CGNS UNKNOWN IMPORTED)
|
|
- set_target_properties(CGNS::CGNS PROPERTIES
|
|
- IMPORTED_LOCATION "${CGNS_LIBRARY}"
|
|
- INTERFACE_INCLUDE_DIRECTORIES "${CGNS_INCLUDE_DIR}")
|
|
- endif ()
|
|
-endif ()
|
|
+#
|
|
+# Find the native CGNS includes and library
|
|
+#
|
|
+# CGNS_INCLUDE_DIR - where to find cgns.h, etc.
|
|
+# CGNS_LIBRARIES - List of fully qualified libraries to link against when using CGNS.
|
|
+# CGNS_FOUND - Do not attempt to use CGNS if "no" or undefined.
|
|
+
|
|
+find_path(CGNS_INCLUDE_DIR
|
|
+ NAMES
|
|
+ cgnslib.h
|
|
+ PATHS
|
|
+ /usr/local/include
|
|
+ /usr/include
|
|
+ DOC "CGNS include directory")
|
|
+mark_as_advanced(CGNS_INCLUDE_DIR)
|
|
+
|
|
+find_library(CGNS_LIBRARY
|
|
+ NAMES
|
|
+ cgnsdll cgns
|
|
+ DOC "CGNS library")
|
|
+mark_as_advanced(CGNS_LIBRARY)
|
|
+
|
|
+if (CGNS_INCLUDE_DIR)
|
|
+ file(STRINGS "${CGNS_INCLUDE_DIR}/cgnslib.h" version
|
|
+ REGEX "CGNS_DOTVERS")
|
|
+ string(REGEX REPLACE ".*CGNS_DOTVERS *\([0-9.]*\).*" "\\1" CGNS_VERSION "${version}")
|
|
+ unset(version)
|
|
+else ()
|
|
+ set(CGNS_VERSION CGNS_VERSION-NOTFOUND)
|
|
+endif ()
|
|
+
|
|
+# handle the QUIETLY and REQUIRED arguments and set CGNS_FOUND to TRUE if
|
|
+# all listed variables are TRUE
|
|
+include(FindPackageHandleStandardArgs)
|
|
+find_package_handle_standard_args(CGNS
|
|
+ REQUIRED_VARS CGNS_INCLUDE_DIR CGNS_LIBRARY
|
|
+ VERSION_VAR CGNS_VERSION)
|
|
+
|
|
+if (CGNS_FOUND)
|
|
+ set(CGNS_LIBRARIES "${CGNS_LIBRARY}")
|
|
+ set(CGNS_INCLUDE_DIRS "${CGNS_INCLUDE_DIR}")
|
|
+ if (NOT TARGET CGNS::CGNS)
|
|
+ add_library(CGNS::CGNS UNKNOWN IMPORTED)
|
|
+ set_target_properties(CGNS::CGNS PROPERTIES
|
|
+ IMPORTED_LOCATION "${CGNS_LIBRARY}"
|
|
+ INTERFACE_INCLUDE_DIRECTORIES "${CGNS_INCLUDE_DIR}")
|
|
+ find_package(HDF5 REQUIRED)
|
|
+ if(TARGET HDF5::HDF5)
|
|
+ set_property(TARGET CGNS::CGNS APPEND PROPERTY
|
|
+ INTERFACE_LINK_LIBRARIES "HDF5::HDF5")
|
|
+ endif()
|
|
+ endif ()
|
|
+endif ()
|