diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index a9971e6cc27a60..2ec30cc5625899 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -39,6 +39,11 @@ if("tests" IN_LIST FEATURES) set(TESTS_ENABLED ON) endif() +set(OPENMP_ENABLED ON) +if (VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") + set(OPENMP_ENABLED Off) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE @@ -48,6 +53,7 @@ vcpkg_cmake_configure( -DTESTS_ENABLED=${TESTS_ENABLED} -DGIT_COMMIT_ID=${GIT_COMMIT_ID} -DGIT_COMMIT_DATE=${COLMAP_GIT_COMMIT_DATE} + -DOPENMP_ENABLED=${OPENMP_ENABLED} ) vcpkg_cmake_install() diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index f1f0a09b63162d..e029534210aa4b 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "colmap", "version-date": "2022-03-14", + "port-version": 1, "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.", "homepage": "https://colmap.github.io/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 4f98d7f26dd8bd..9a6d1fb103128d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1538,7 +1538,7 @@ }, "colmap": { "baseline": "2022-03-14", - "port-version": 0 + "port-version": 1 }, "color-console": { "baseline": "2022-03-20", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index 3f00dddf1029a8..e65f997a00e265 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc9f3b2c6df41f81ef8ad2b7657c87bfb1bb83f3", + "version-date": "2022-03-14", + "port-version": 1 + }, { "git-tree": "bf74fe8bdad103c3212e029ac7e736c759be2aa8", "version-date": "2022-03-14",