mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 05:19:06 +08:00
[colmap] fix arm64-osx build (#27095)
This commit is contained in:
parent
f579f4c7d2
commit
4b6d101cc3
@ -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()
|
||||
|
@ -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",
|
||||
|
@ -1538,7 +1538,7 @@
|
||||
},
|
||||
"colmap": {
|
||||
"baseline": "2022-03-14",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"color-console": {
|
||||
"baseline": "2022-03-20",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "bc9f3b2c6df41f81ef8ad2b7657c87bfb1bb83f3",
|
||||
"version-date": "2022-03-14",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "bf74fe8bdad103c3212e029ac7e736c759be2aa8",
|
||||
"version-date": "2022-03-14",
|
||||
|
Loading…
Reference in New Issue
Block a user