Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 2 additions & 1 deletion ports/armadillo/CONTROL
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Source: armadillo
Version: 2019-04-16-f00d3225
Version: 2019-04-16-1
Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use
Build-Depends: openblas (!osx), clapack (!osx)
64 changes: 35 additions & 29 deletions ports/armadillo/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,29 +1,35 @@
include(vcpkg_common_functions)

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_gitlab(
GITLAB_URL https://gitlab.com
OUT_SOURCE_PATH SOURCE_PATH
REPO conradsnicta/armadillo-code
REF f00d3225b1c005775044369723f31cecc3cd6569
SHA512 ca3574edf5de8c752867403c3856ed9569fbed2ce9729585cae59be5751493c2e71121319b0a812e2ea56baada6b6f62fbc84ce6f1efb362347e5fd4141ccf1b
HEAD_REF 9.400.x
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DDETECT_HDF5=false
)

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/Armadillo/CMake TARGET_PATH share/armadillo)

vcpkg_copy_pdbs()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/Armadillo RENAME copyright)
include(vcpkg_common_functions)

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_gitlab(
GITLAB_URL https://gitlab.com
OUT_SOURCE_PATH SOURCE_PATH
REPO conradsnicta/armadillo-code
REF f00d3225b1c005775044369723f31cecc3cd6569
SHA512 ca3574edf5de8c752867403c3856ed9569fbed2ce9729585cae59be5751493c2e71121319b0a812e2ea56baada6b6f62fbc84ce6f1efb362347e5fd4141ccf1b
HEAD_REF 9.400.x
PATCHES
remove_custom_modules.patch
)

file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindBLAS.cmake)
file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindLAPACK.cmake)
file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindOpenBLAS.cmake)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DDETECT_HDF5=false
)

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/armadillo/CMake TARGET_PATH share/armadillo)

vcpkg_copy_pdbs()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/armadillo RENAME copyright)
17 changes: 17 additions & 0 deletions ports/armadillo/remove_custom_modules.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0959127..9fea721 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -176,10 +176,9 @@ else()
include(ARMA_FindMKL)
include(ARMA_FindACMLMP)
include(ARMA_FindACML)
- include(ARMA_FindOpenBLAS)
include(ARMA_FindATLAS)
- include(ARMA_FindBLAS)
- include(ARMA_FindLAPACK)
+ find_package(BLAS)
+ find_package(LAPACK)

message(STATUS " MKL_FOUND = ${MKL_FOUND}" )
message(STATUS " ACMLMP_FOUND = ${ACMLMP_FOUND}" )
2 changes: 1 addition & 1 deletion ports/assimp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimp-config.cmake ASSIMP_CONFIG
string(REPLACE "get_filename_component(ASSIMP_ROOT_DIR \"\${_PREFIX}\" PATH)"
"set(ASSIMP_ROOT_DIR \${_PREFIX})" ASSIMP_CONFIG ${ASSIMP_CONFIG})

if(WIN32)
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
string(REPLACE "set( ASSIMP_LIBRARIES \${ASSIMP_LIBRARIES})"
"set( ASSIMP_LIBRARIES optimized \${ASSIMP_LIBRARY_DIRS}/\${ASSIMP_LIBRARIES}.lib debug \${ASSIMP_LIBRARY_DIRS}/../debug/lib/\${ASSIMP_LIBRARIES}d.lib)" ASSIMP_CONFIG ${ASSIMP_CONFIG})
else()
Expand Down
2 changes: 1 addition & 1 deletion ports/blaze/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: blaze
Version: 3.5
Build-Depends: clapack, boost-exception
Build-Depends: clapack (!osx), boost-exception
Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.
Loading