Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[openexr,openimageio,suitesparse,theia] updates for non-win32 #6371

Merged
merged 42 commits into from
May 31, 2019
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
e984f5c
[openexr,openimageio,suitesparse,theia] updates for non-win32
cenit May 9, 2019
7b26376
Merge branch 'master' into dev/cenit/theia
cenit May 13, 2019
c574b5d
[theia] use only valid cmake symbols
cenit May 13, 2019
251f9bf
[suitesparse] Fix build
vicroms May 14, 2019
792fa3f
[lapack] still not properly integrating with other ports
cenit May 14, 2019
7c7514b
[lapack] intercept cmake module calls and substitute them with our defs
cenit May 14, 2019
d576785
[suitesparse,clapack] fixes for proper integration
cenit May 14, 2019
a5bfd81
[ceres,clapack] bump CONTROL
cenit May 14, 2019
6cd1302
[suitesparse] remove unnecessary defs
cenit May 15, 2019
55f48f5
Merge branch 'master' into dev/cenit/theia
cenit May 15, 2019
f054f78
[clapack] improve wrapper logic
cenit May 15, 2019
26132c2
[WIN32] remove wrong symbol
cenit May 15, 2019
55bb36b
[clapack] fix wrapper integration
cenit May 15, 2019
485cdeb
[Accelerate] use best framework when available
cenit May 15, 2019
e6f56b8
[clapack] separate config from wrapper
cenit May 17, 2019
0b42aed
Merge branch 'master' into dev/cenit/theia
cenit May 17, 2019
46204e1
[clapack] fix paths and filenames
cenit May 18, 2019
fdf6085
[mlpack,armadillo,clapack] improve library handling
cenit May 19, 2019
8424c9d
[mlpack] remove unnecessary cmake option
cenit May 20, 2019
92cf8d3
[clp,coinutils,osi,liblemon] dependencies of openmvg, improve compati…
cenit May 21, 2019
c6bf31b
Merge branch 'master' into dev/cenit/theia
cenit May 21, 2019
99a72c9
[openmvg] fix for case-sensitive filesystems
cenit May 21, 2019
8efcb8a
[clp,coinutils,osi] simplify CMakeLists removing many unnecessary steps
cenit May 21, 2019
d3034e6
Merge branch 'master' into dev/cenit/theia
cenit May 22, 2019
0f5893d
[sophus] Force rebuild
vicroms May 22, 2019
c0776f0
Merge branch 'master' into dev/cenit/theia
vicroms May 23, 2019
8e45123
Merge branch 'master' into dev/cenit/theia
cenit May 27, 2019
303fbbb
Merge branch 'master' into dev/cenit/theia
cenit May 29, 2019
ee9c633
[theia] fixes for linux, part1
cenit May 29, 2019
9910a6f
[io2d] remove broken sintax
cenit May 29, 2019
458022a
[fontconfig] bump version to remove CI cached failure
cenit May 29, 2019
e0e2ad4
[theia] fixes for linux, part2
cenit May 29, 2019
8816585
[theia] remove unnecessary empty folders and comments from portfile
cenit May 29, 2019
5f67148
[theia] use correct build type removing forced vars in cmakelists.txt
cenit May 30, 2019
b48941d
[openmvg] add missing suitesparse target detection
cenit May 30, 2019
1fb8b56
[sophus] fix Suitesparse dependency
cenit May 30, 2019
a366897
[sophus,openmvg] use suitesparse lowercase for module compatibility o…
cenit May 30, 2019
6b62b33
[suitesparse] fixes for case-sensitive filesystems
cenit May 30, 2019
a73955f
[openmvg] use correct Eigen3 name for case-sensitive filesystems
cenit May 30, 2019
2d32b0f
[sophus] trigger rebuild
cenit May 30, 2019
aadde60
[shogun] use modern vcpkg style
cenit May 31, 2019
76bed99
[shogun] add missing cmake system processor symbol
cenit May 31, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
949 changes: 0 additions & 949 deletions ports/ceres/0003_remove_unnecessary_cmake_modules.patch

This file was deleted.

3 changes: 1 addition & 2 deletions ports/ceres/CONTROL
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Source: ceres
Version: 1.14.0-3
# eigen is always required by CMake, even if it isn't used.
Version: 1.14.0-4
Build-Depends: glog, eigen3
Description: non-linear optimization package

Expand Down
13 changes: 8 additions & 5 deletions ports/ceres/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,16 @@ vcpkg_from_github(
PATCHES
0001_add_missing_include_path.patch
0002_cmakelists_fixes.patch
0003_remove_unnecessary_cmake_modules.patch
0004_use_glog_target.patch
0005_fix_exported_ceres_config.patch
0003_use_glog_target.patch
0004_fix_exported_ceres_config.patch
)

file(REMOVE ${SOURCE_PATH}/cmake/FindGflags.cmake)
file(REMOVE ${SOURCE_PATH}/cmake/FindGlog.cmake)
#file(REMOVE ${SOURCE_PATH}/cmake/FindEigen.cmake)
file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake)
#file(REMOVE ${SOURCE_PATH}/cmake/FindTBB.cmake)

set(SUITESPARSE OFF)
if("suitesparse" IN_LIST FEATURES)
set(SUITESPARSE ON)
Expand Down Expand Up @@ -59,8 +64,6 @@ vcpkg_configure_cmake(
-DEIGENSPARSE=${EIGENSPARSE}
-DLAPACK=${LAPACK}
-DSUITESPARSE=${SUITESPARSE}
-DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=ON
-DGLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION=OFF # TheiaSfm doesn't work well with this.
-DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT_VALUE}
)

Expand Down
2 changes: 1 addition & 1 deletion ports/clapack/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: clapack
Version: 3.2.1-4
Version: 3.2.1-5
Description: CLAPACK (f2c'ed version of LAPACK)
Build-Depends: openblas (!osx)
18 changes: 0 additions & 18 deletions ports/clapack/fix-lack-library.patch

This file was deleted.

46 changes: 0 additions & 46 deletions ports/clapack/fix-linux-build.patch

This file was deleted.

Loading