3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 15:48:01 +08:00
Code Issues Projects Releases Wiki Activity

[theia] Fix cmake include (#29155)

Browse Source 
* [theia] fix wrong include

* v db
This commit is contained in:
Alexander Neumann 2023-01-25 01:37:52 +01:00 committed by GitHub
parent d235330027
commit 2ecdb57d27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/theia/266.diff Normal file
View File

@ -0,0 +1,12 @@
diff --git a/libraries/vlfeat/CMakeLists.txt b/libraries/vlfeat/CMakeLists.txt
index 7f4ffc796..9535d0c22 100644
--- a/libraries/vlfeat/CMakeLists.txt
+++ b/libraries/vlfeat/CMakeLists.txt
@@ -1,6 +1,6 @@
project(vlfeat)
-include("${CMAKE_MODULE_PATH}/OptimizeTheiaCompilerFlags.cmake")
+include(OptimizeTheiaCompilerFlags)
optimizetheiacompilerflags()
include_directories(./vl)

33
ports/theia/portfile.cmake
View File

@ -10,16 +10,17 @@ vcpkg_from_github(
fix-external-dependencies.patch fix-external-dependencies.patch
fix-external-dependencies2.patch fix-external-dependencies2.patch
eigen-3.4.patch eigen-3.4.patch
266.diff
) )
file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake) file(REMOVE "${SOURCE_PATH}/cmake/FindSuiteSparse.cmake")
file(REMOVE ${SOURCE_PATH}/cmake/FindOpenImageIO.cmake) file(REMOVE "${SOURCE_PATH}/cmake/FindOpenImageIO.cmake")
file(REMOVE ${SOURCE_PATH}/cmake/FindGflags.cmake) file(REMOVE "${SOURCE_PATH}/cmake/FindGflags.cmake")
file(REMOVE ${SOURCE_PATH}/cmake/FindGlog.cmake) file(REMOVE "${SOURCE_PATH}/cmake/FindGlog.cmake")
file(REMOVE ${SOURCE_PATH}/cmake/FindEigen.cmake) file(REMOVE "${SOURCE_PATH}/cmake/FindEigen.cmake")
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
-DCMAKE_CXX_STANDARD=14 -DCMAKE_CXX_STANDARD=14
-DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_EXTENSIONS=OFF
@ -34,15 +35,15 @@ vcpkg_cmake_config_fixup()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
# Clean # Clean
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/optimo) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/optimo")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/optimo) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/optimo")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/cimg/cmake-modules) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/cimg/cmake-modules")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/cmake")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/datasets) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/datasets")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/spectra/doxygen) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/theia/libraries/spectra/doxygen")
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(COPY ${SOURCE_PATH}/data/camera_sensor_database_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(COPY "${SOURCE_PATH}/data/camera_sensor_database_license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

2
ports/theia/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "theia", "name": "theia",
"version": "0.8", "version": "0.8",
"port-version": 7, "port-version": 8,
"description": "An open source library for multiview geometry and structure from motion", "description": "An open source library for multiview geometry and structure from motion",
"homepage": "https://github.com/sweeneychris/TheiaSfM", "homepage": "https://github.com/sweeneychris/TheiaSfM",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

2
versions/baseline.json
View File

@ -7554,7 +7554,7 @@
}, },
"theia": { "theia": {
"baseline": "0.8", "baseline": "0.8",
"port-version": 7 "port-version": 8
}, },
"think-cell-range": { "think-cell-range": {
"baseline": "498839d", "baseline": "498839d",

5
versions/t-/theia.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "fe4bf7c896536d692bedb215d88cae3297b1ae1b",
"version": "0.8",
"port-version": 8
},
{ {
"git-tree": "e8a6f763efb9bd7657a6be700493a95ab32d1cb6", "git-tree": "e8a6f763efb9bd7657a6be700493a95ab32d1cb6",
"version": "0.8", "version": "0.8",