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

[many ports] improvements for linux/wsl #6730

Merged
merged 86 commits into from
Jun 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
e78f1c9
[many ports] improve compatibility with WSL and mixed case filesystems
cenit Jun 1, 2019
3d8d799
[treehopper] express dependency on libusb, which was not working on n…
cenit Jun 1, 2019
c5f681f
[libharu] add compatibility with non-win32 platforms
cenit Jun 1, 2019
aaa766b
[geogram] fix openblas on linux
cenit Jun 1, 2019
96ed943
[openblas] playing with underscore, without success
cenit Jun 4, 2019
ffcccf0
[openblas/lapack] fix library integration
cenit Jun 4, 2019
ca23aa6
[clapack] improve target handling in cmake module
cenit Jun 5, 2019
fb95b01
[openblas] promote self-generated config to default cmake module, oth…
cenit Jun 5, 2019
a646a7b
[clapack,openblas] improve libraries integration
cenit Jun 5, 2019
db8f3db
[many ports] fix cmake unnecessary target paths, wrong config paths, …
cenit Jun 5, 2019
bd1afcd
Merge branch 'master' into dev/cenit/coin
cenit Jun 5, 2019
3fa4294
[suitesparse] improve integration with new lapack/openblas mechanism
cenit Jun 5, 2019
e5761f3
Merge branch 'dev/cenit/coin' of https://github.com/cenit/vcpkg into …
cenit Jun 5, 2019
9dc1490
[suitesparse] add no underscore postfix also for linux
cenit Jun 5, 2019
96b7846
[ceres] fix integration with newer openblas/lapack configs
cenit Jun 5, 2019
bf703b7
[aws-c-event-stream] fix regression
cenit Jun 6, 2019
711520d
[systemc] fix regression
cenit Jun 6, 2019
8bae6a8
[libwebp,geogram] trigger rebuild
cenit Jun 6, 2019
116baa5
[libwebp,pthread4w] fix regressions
cenit Jun 6, 2019
921e6b6
[glbinding] fix cmake module installation
cenit Jun 7, 2019
86c74da
Merge branch 'master' into dev/cenit/coin
cenit Jun 7, 2019
ab694a6
[globjects] disentangle unnecessary dependency from qt5
cenit Jun 7, 2019
8532f71
[jasper] remove broken and unnecessary patches
cenit Jun 9, 2019
d9111e7
[libwebp] fix regression
cenit Jun 9, 2019
39399eb
[many ports] avoid using BUILD_SHARED_LIBS which is uninitialized in …
cenit Jun 10, 2019
b8c2b3e
[clapack] correctly find dlls
cenit Jun 10, 2019
679bf3b
[clapack] use a generic blas as dependency
cenit Jun 10, 2019
4342a47
Merge branch 'master' into dev/cenit/coin
cenit Jun 10, 2019
a7a18da
[fizz,g2o] restore expected version
cenit Jun 10, 2019
b862425
fix mistake
cenit Jun 10, 2019
dbf0894
[many ports] remove WIN32, APPLE and UNIX (again, they keep creeping …
cenit Jun 10, 2019
8e05f94
[libressl,openssl] do not try to build one if the other is already in…
cenit Jun 10, 2019
5c36b60
[itk] update ref and patch to avoid regression
cenit Jun 10, 2019
96ade54
[libressl,openssl] implement full strategy to fix CI
cenit Jun 10, 2019
99086ce
[libwebp] disable components that are broken on macOS
cenit Jun 10, 2019
fa5a3f7
[ogre] enable macOS build
cenit Jun 10, 2019
1fcbe2d
merge with master
cenit Jun 11, 2019
2fd5d35
[freeimage,jxrlib,ogre,openexr,protobuf] port patches from #5169
cenit Jun 11, 2019
eee4435
[ogre] add missing install command
cenit Jun 11, 2019
4904fbc
[ffmpeg] enable wrapper for cmake module
cenit Jun 11, 2019
026f18c
[ffmpeg] add avresample module finder
cenit Jun 11, 2019
db5f048
[ffmpeg] improve module detection and exported symbols
cenit Jun 11, 2019
09a3c85
[ffmpeg] add variables to cache
cenit Jun 12, 2019
eec033a
[thrift] remove unnecessary build option
cenit Jun 12, 2019
e1b334f
[allegro5] fix shared/static inversion
cenit Jun 12, 2019
aa87711
[protobuf] cleanup
cenit Jun 12, 2019
638aec9
[libressl] cleanup
cenit Jun 12, 2019
5a14525
[moos-core] cleanup
cenit Jun 12, 2019
acc671a
commented features must not be separated from other features, otherwi…
cenit Jun 12, 2019
b65c212
[itk] fix regression
cenit Jun 12, 2019
0c137b4
[shogun,itk] fix regressions
cenit Jun 12, 2019
ff7894b
[ogre] fix regression
cenit Jun 13, 2019
e1916b3
[opusfile] add compatibility with non-win32
cenit Jun 13, 2019
e309773
Merge branch 'master' into dev/cenit/coin
cenit Jun 13, 2019
31e17e2
[itk] fix regression
cenit Jun 14, 2019
2f64ef6
Merge branch 'master' into dev/cenit/coin
cenit Jun 14, 2019
dcb91c5
[sndfile,libsndfile] remove duplicate, redirect sndfile to libsndfile
cenit Jun 17, 2019
320e73c
merge with master
cenit Jun 17, 2019
3b0a50d
add missing dependencies
cenit Jun 17, 2019
0f64fb1
[ismrmrd] fix regression
cenit Jun 18, 2019
175d26a
[ffmpeg] trigger rebuild
cenit Jun 18, 2019
88413b4
Merge branch 'master' into dev/cenit/coin
cenit Jun 18, 2019
2a93baa
[clapack,openblas,libogg] fix regressions on macOS
cenit Jun 18, 2019
8aee053
Merge branch 'master' into dev/cenit/coin
cenit Jun 18, 2019
7548c22
[libtins] fix regression
cenit Jun 18, 2019
1dbc5a3
force rebuild windows regressions, unable to reproduce locally
cenit Jun 19, 2019
37ac55a
[mosquitto] enable non-win32 builds
cenit Jun 19, 2019
c467377
[json-dto] force rebuild, unable to reproduce regression locally
cenit Jun 19, 2019
54f1f12
[many ports] uniform naming and path length requests
cenit Jun 19, 2019
83dcff2
fix regression
cenit Jun 19, 2019
58a029f
fix regression
cenit Jun 19, 2019
e3891be
Merge branch 'dev/cenit/coin' of https://github.com/cenit/vcpkg into …
cenit Jun 19, 2019
f98cde8
Merge branch 'dev/cenit/coin' of https://github.com/cenit/vcpkg into …
cenit Jun 19, 2019
d76b22b
[ffmpeg] fixes for downstream projects
cenit Jun 19, 2019
7c71974
merge
cenit Jun 19, 2019
5f5848e
clean up - thanks to reviewers
cenit Jun 19, 2019
1af9445
trigger rebuild of regressions on macOS
cenit Jun 20, 2019
8b784bc
trigger rebuild of regressions on macOS - part2
cenit Jun 20, 2019
3fe5f47
Add core back
cbezault Jun 20, 2019
df01269
Use VCPKG_CONCURRENCY
cbezault Jun 20, 2019
387cc18
Add core back to suitesparse
cbezault Jun 20, 2019
c1e47e8
Add core back to curl
cbezault Jun 20, 2019
ff8fe54
Add core back to magnum
cbezault Jun 20, 2019
f8f0dc1
Add core back to magnum
cbezault Jun 20, 2019
f7eded9
Add core back to magnum
cbezault Jun 20, 2019
1a926e2
Add core back to cgal
cbezault Jun 20, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion ports/alembic/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: alembic
Version: 1.7.11
Version: 1.7.11-2
Build-Depends: ilmbase, hdf5
Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.
Homepage: https://alembic.io/
4 changes: 2 additions & 2 deletions ports/alembic/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(vcpkg_common_functions)

string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
message(WARNING "Alembic's buildsystem uses very long paths and may fail on your system.\n"
message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n"
"We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
)
endif()
Expand Down Expand Up @@ -30,7 +30,7 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Alembic")
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Alembic)

vcpkg_copy_pdbs()

Expand Down
38 changes: 10 additions & 28 deletions ports/allegro5/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,44 +1,29 @@
# Common Ambient Variables:
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
#

include(vcpkg_common_functions)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO liballeg/allegro5
REF 5.2.5.0
SHA512 9b97a46f0fd146c3958a5f8333822665ae06b984b3dbedc1356afdac8fe3248203347cb08b30ebda049a7320948c7844e9d00dc055c317836c2557b5bfc2ab04
HEAD_REF master
PATCHES
fix-pdb-install.patch
)

if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(ALLEGRO_USE_STATIC ON)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(VCPKG_BUILD_SHARED_LIBS ON)
else()
set(ALLEGRO_USE_STATIC OFF)
set(VCPKG_BUILD_SHARED_LIBS OFF)
endif()

vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/fix-pdb-install.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
PREFER_NINJA
OPTIONS
-DWANT_DOCS=OFF
-DALLEGRO_SDL=OFF
-DWANT_DEMO=OFF
-DSHARED=${ALLEGRO_USE_STATIC}
-DSHARED=${VCPKG_BUILD_SHARED_LIBS}
-DWANT_EXAMPLES=OFF
-DWANT_CURL_EXAMPLE=OFF
-DWANT_TESTS=OFF
Expand Down Expand Up @@ -81,14 +66,11 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()

# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/allegro5)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/allegro5/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/allegro5/copyright)

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

file(GLOB PDB_GLOB ${CURRENT_BUILDTREES_DIR}-dbg/lib/*.pdb)
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}-dbg/lib/Debug)
file(COPY ${PDB_GLOB} DESTINATION ${CURRENT_BUILDTREES_DIR}-dbg/lib/Debug)

vcpkg_copy_pdbs()

file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/allegro5 RENAME copyright)
4 changes: 2 additions & 2 deletions ports/angelscript/CONTROL
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: angelscript
Version: 2.33.0
Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.
Version: 2.33.0-1
Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.
24 changes: 2 additions & 22 deletions ports/angelscript/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
# Common Ambient Variables:
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
#

include(vcpkg_common_functions)

vcpkg_download_distfile(ARCHIVE
Expand All @@ -20,14 +8,9 @@ vcpkg_download_distfile(ARCHIVE

vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
# (Optional) A friendly name to use instead of the filename of the archive (e.g.: a version number or tag).
# REF 1.0.0
# (Optional) Read the docs for how to generate patches at:
# https://github.com/Microsoft/vcpkg/blob/master/docs/examples/patching.md
ARCHIVE ${ARCHIVE}
PATCHES
mark-threads-private.patch
# 002_more_port_fixes.patch
)

vcpkg_configure_cmake(
Expand All @@ -41,10 +24,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Angelscript")
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Angelscript)

# Handle copyright
file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angelscript RENAME copyright)

# Post-build test for cmake libraries
# vcpkg_test_cmake(PACKAGE_NAME angelscript)
2 changes: 1 addition & 1 deletion ports/armadillo/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: armadillo
Version: 2019-04-16-1
Version: 2019-04-16-2
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)
2 changes: 1 addition & 1 deletion ports/armadillo/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ vcpkg_configure_cmake(
)

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

vcpkg_copy_pdbs()

Expand Down
2 changes: 1 addition & 1 deletion ports/arrow/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib)
message(FATAL_ERROR "Installed lib file should be named 'arrow.lib' via patching the upstream build.")
endif()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/arrow TARGET_PATH share/arrow)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/arrow)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
Expand Down
2 changes: 1 addition & 1 deletion ports/assimp/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: assimp
Version: 4.1.0-5
Version: 4.1.0-8
Homepage: https://github.com/assimp/assimp
Description: The Open Asset import library
Build-Depends: zlib, rapidjson
10 changes: 8 additions & 2 deletions ports/assimp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,19 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib ${SOURCE_PATH}/contrib/gtest ${S
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")

if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(VCPKG_BUILD_SHARED_LIBS ON)
else()
set(VCPKG_BUILD_SHARED_LIBS OFF)
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DASSIMP_BUILD_TESTS=OFF
-DASSIMP_BUILD_ASSIMP_VIEW=OFF
-DASSIMP_BUILD_ZLIB=OFF
-DASSIMP_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
-DASSIMP_BUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS}
-DASSIMP_BUILD_ASSIMP_TOOLS=OFF
-DASSIMP_INSTALL_PDB=OFF
#-DSYSTEM_IRRXML=ON # Wait for the built-in irrxml to synchronize with port irrlich, add dependencies and enable this macro
Expand All @@ -46,7 +52,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")
cenit marked this conversation as resolved.
Show resolved Hide resolved
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
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})
Expand Down
2 changes: 1 addition & 1 deletion ports/avro-c/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(vcpkg_common_functions)

string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
message(WARNING "Avro-c's buildsystem uses very long paths and may fail on your system.\n"
message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n"
"We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
)
endif()
Expand Down
4 changes: 2 additions & 2 deletions ports/aws-c-common/CONTROL
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: aws-c-common
Version: 0.3.11
Description: AWS common library for C
Version: 0.3.11-1
Description: AWS common library for C
4 changes: 2 additions & 2 deletions ports/aws-c-common/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-c-common/cmake)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/cmake)
cenit marked this conversation as resolved.
Show resolved Hide resolved
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)

file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
Expand All @@ -34,4 +34,4 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aw

file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/share
)
)
4 changes: 2 additions & 2 deletions ports/aws-c-event-stream/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/cmake"
"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common"
)

vcpkg_install_cmake()
Expand All @@ -32,4 +32,4 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aw

file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/share
)
)
4 changes: 2 additions & 2 deletions ports/aws-sdk-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ include(vcpkg_common_functions)

string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
message(WARNING "Aws-sdk-cpp's buildsystem uses very long paths and may fail on your system.\n"
message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n"
"We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
)
endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aws/aws-sdk-cpp
REF 1.7.116
REF 1.7.116
SHA512 2d10aebf1c10bb7e7a0efa1fd930b8743d9bce1d7d36f72c55fd13612be4fd30cf0a67ebe4f8d7c05146306084b10d8657ff26ac3bafaaa9efaa4c67707acb49
HEAD_REF master
)
Expand Down
2 changes: 1 addition & 1 deletion ports/azure-storage-cpp/CONTROL
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Version: 6.1.0
Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext
Description: Microsoft Azure Storage Client SDK for C++
A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client.
Homepage: https://blogs.msdn.com/b/windowsazurestorage/
Homepage: https://blogs.msdn.com/b/windowsazurestorage/
4 changes: 2 additions & 2 deletions ports/botan/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: botan
Version: 2.9.0
Version: 2.9.0-1
Homepage: https://botan.randombit.net
Description: A cryptography library written in C++11
Description: A cryptography library written in C++11
31 changes: 7 additions & 24 deletions ports/botan/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,14 @@ vcpkg_from_github(
HEAD_REF master
)

set(NUMBER_OF_PROCESSORS "1")
if(DEFINED ENV{NUMBER_OF_PROCESSORS})
set(NUMBER_OF_PROCESSORS $ENV{NUMBER_OF_PROCESSORS})
else()
if(APPLE)
set(job_count_command sysctl -n hw.physicalcpu)
else()
set(job_count_command nproc)
endif()
execute_process(
COMMAND ${job_count_command}
OUTPUT_VARIABLE NUMBER_OF_PROCESSORS
)
string(REPLACE "\n" "" NUMBER_OF_PROCESSORS "${NUMBER_OF_PROCESSORS}")
string(REPLACE " " "" NUMBER_OF_PROCESSORS "${NUMBER_OF_PROCESSORS}")
if(NOT NUMBER_OF_PROCESSORS)
set(NUMBER_OF_PROCESSORS "1")
endif()
endif()

if(CMAKE_HOST_WIN32)
vcpkg_find_acquire_program(JOM)
set(build_tool "${JOM}" /J ${NUMBER_OF_PROCESSORS})
set(build_tool "${JOM}")
set(parallel_build "/J ${VCPKG_CONCURRENCY}")
else()
find_program(MAKE make)
set(build_tool "${MAKE}" -j${NUMBER_OF_PROCESSORS})
set(build_tool "${MAKE}")
set(parallel_build "-j${VCPKG_CONCURRENCY}")
endif()

vcpkg_find_acquire_program(PYTHON3)
Expand Down Expand Up @@ -93,7 +75,7 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)
--link-method=copy)
if(CMAKE_HOST_WIN32)
list(APPEND configure_arguments ${BOTAN_MSVC_RUNTIME}${BOTAN_MSVC_RUNTIME_SUFFIX})
endif()
endif()

vcpkg_execute_required_process(
COMMAND "${PYTHON3}" "${SOURCE_PATH}/configure.py" ${configure_arguments}
Expand All @@ -102,8 +84,9 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)
message(STATUS "Configure ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done")

message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}")
vcpkg_execute_required_process(
vcpkg_execute_build_process(
COMMAND ${build_tool}
NO_PARALLEL_COMMAND "${build_tool} ${parallel_build}"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}"
LOGNAME build-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE})
message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done")
Expand Down
3 changes: 1 addition & 2 deletions ports/c-ares/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Source: c-ares
Version: 2019-5-2
Version: 2019-5-2-1
Homepage: https://github.com/c-ares/c-ares
Description: A C library for asynchronous DNS requests
Build-Depends:
2 changes: 1 addition & 1 deletion ports/c-ares/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/c-ares")
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/c-ares)

if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
Expand Down
2 changes: 1 addition & 1 deletion ports/capnproto/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: capnproto
Version: 0.7.0-1
Version: 0.7.0-2
Description: Data interchange format and capability-based RPC system
Homepage: https://capnproto.org/
Build-Depends: zlib
4 changes: 2 additions & 2 deletions ports/capnproto/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH})

vcpkg_install_cmake()

vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/CapnProto")
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CapnProto)

file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/capnproto")
Expand All @@ -39,4 +39,4 @@ file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/capnp
file(RENAME ${CURRENT_PACKAGES_DIR}/share/capnproto/LICENSE ${CURRENT_PACKAGES_DIR}/share/capnproto/copyright)

# Disabled for now, see #5630 and #5635
# vcpkg_test_cmake(PACKAGE_NAME CapnProto)
# vcpkg_test_cmake(PACKAGE_NAME CapnProto)
2 changes: 1 addition & 1 deletion ports/cartographer/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: cartographer
Version: 1.0.0
Version: 1.0.0-1
Build-Depends: ceres[suitesparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf
Homepage: https://github.com/googlecartographer/cartographer
Description: Google 2D & 3D SLAM package
2 changes: 1 addition & 1 deletion ports/cartographer/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ vcpkg_configure_cmake(
)

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/cartographer)
vcpkg_fixup_cmake_targets()
vcpkg_copy_pdbs()

# Clean
Expand Down
Loading