diff options
| author | Gilles Grospellier <63445205+grospelliergilles@users.noreply.github.com> | 2021-04-29 02:39:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 17:39:30 -0700 |
| commit | 2a90d45fad8ae949233eca16946d1e9942bd8f22 (patch) | |
| tree | f98fcf6d601348f6c999045201c943e6650f9a48 /ports | |
| parent | 5db5b34a05f5c4dd8755c515eaed25ba978ac92c (diff) | |
| download | vcpkg-2a90d45fad8ae949233eca16946d1e9942bd8f22.tar.gz vcpkg-2a90d45fad8ae949233eca16946d1e9942bd8f22.zip | |
[parmetis] Fix build on x64-linux. (#17410)
* Fix parmetis build on x64-linux.
- Change 'METIS' directory to 'metis' because the true name is 'metis'.
- Remove the non working (on linux) link 'METIS' to 'metis'.
- Use absolute path for GKLIB_PATH. Using relative path does not work
for test HAVE_THREADLOCALSTORAGE in metis/GKlib/GKlibSystem.cmake
* Update parmetis version in baseline.
* Update CONTROL file
* Apply reviewer comment.
* Update ci-baseline.txt
* Update hash in parmetis.json.
* Update port version instead of package version.
* Update hash version
* Try to build parmetis on 'osx'.
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/parmetis/CONTROL | 3 | ||||
| -rw-r--r-- | ports/parmetis/fix-root-cmakelist-2.patch | 18 | ||||
| -rw-r--r-- | ports/parmetis/portfile.cmake | 1 |
3 files changed, 21 insertions, 1 deletions
diff --git a/ports/parmetis/CONTROL b/ports/parmetis/CONTROL index c98d4869f..7ef872fac 100644 --- a/ports/parmetis/CONTROL +++ b/ports/parmetis/CONTROL @@ -1,5 +1,6 @@ Source: parmetis
-Version: 4.0.3-3
+Version: 4.0.3
+Port-Version: 4
Homepage: https://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview
Description: Parallel Graph Partitioning and Fill-reducing Matrix Ordering
Build-Depends: metis, mpi
diff --git a/ports/parmetis/fix-root-cmakelist-2.patch b/ports/parmetis/fix-root-cmakelist-2.patch new file mode 100644 index 000000000..8f4630bfa --- /dev/null +++ b/ports/parmetis/fix-root-cmakelist-2.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt 2013-03-30 17:24:50.000000000 +0100 ++++ b/CMakeLists.txt 2021-04-20 10:41:49.946801222 +0200 +@@ -1,12 +1,12 @@ + cmake_minimum_required(VERSION 2.8) + project(ParMETIS) + +-set(GKLIB_PATH METIS/GKlib CACHE PATH "path to GKlib") +-set(METIS_PATH METIS CACHE PATH "path to METIS") ++set(GKLIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/metis/GKlib CACHE PATH "path to GKlib") ++set(METIS_PATH metis CACHE PATH "path to METIS") + + # Symlink ./metis to wherever metis is. This allows files to be + # included from metis/libmetis/. +-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${METIS_PATH} metis) ++#execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${METIS_PATH} metis) + + # Search for MPI. + # GK commented this out as it seems to be creating problems diff --git a/ports/parmetis/portfile.cmake b/ports/parmetis/portfile.cmake index a7558a877..62d633eac 100644 --- a/ports/parmetis/portfile.cmake +++ b/ports/parmetis/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_extract_source_archive_ex( fix-root-cmakelist.patch fix-libparmetis-cmakelist.patch use_stdint.patch + fix-root-cmakelist-2.patch ) vcpkg_configure_cmake( |