* Update vcpkgcmdarguments.cpp
Fix the bug for master branch, the var of OVERLAY_TRIPLETS_ENV be defined two times (the lines of 923 and 925 )
[69/83] Building CXX object CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o
FAILED: CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o
/usr/local/bin/g++-6 -DVCPKG_USE_STD_FILESYSTEM=0 -I../include -O3 -DNDEBUG -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.14.sdk -include /Users/lizhipeng/develop/project/git_project/opensource/c++/vcpkg/toolsrc/include/pch.h -std=c++1z -MD -MT CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o -MF CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o.d -o CMakeFiles/vcpkglib.dir/src/vcpkg/vcpkgcmdarguments.cpp.o -c ../src/vcpkg/vcpkgcmdarguments.cpp
../src/vcpkg/vcpkgcmdarguments.cpp:925:48: error: redefinition of 'constexpr const vcpkg::StringLiteral vcpkg::VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV'
constexpr StringLiteral VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV;
^~~~~~~~~~~~~~~~~~~~
In file included from ../src/vcpkg/vcpkgcmdarguments.cpp:9:0:
../include/vcpkg/vcpkgcmdarguments.h:145:40: note: 'constexpr const vcpkg::StringLiteral vcpkg::VcpkgCmdArguments::OVERLAY_TRIPLETS_ENV' previously defined here
constexpr static StringLiteral OVERLAY_TRIPLETS_ENV = "VCPKG_OVERLAY_TRIPLETS";
* Update toolsrc/src/vcpkg/vcpkgcmdarguments.cpp
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* [vcpkg/scripts/fixup_cmake] add option NO_PREFIX_CORRECTION to not apply the
* add a bit of explanation why the prefix correction might be incorrect.
* apply the if only around the import prefix changes
* Update scripts/cmake/vcpkg_fixup_cmake_targets.cmake
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Fix retry logic for fs.rename()
* Increase timeout for fs.rename(), add diagnostic message
* Make formatting happy
* Exponential backoff for archive file rename
* Remove random local file from last commit
* Remove random local file from last commit
* Update toolsrc/src/vcpkg/archives.cpp
Co-authored-by: Mikayel Apozyan <Mikayel.Apozyan@avira.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* [boost-locale] Use CMAKE_SYSTEM_NAME as a fallback where VCPKG_TARGET_IS_WINDOWS is not available
* fix this issue in a different way
* Remove comments in b2-options.cmake.in
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* fix generate-ports.ps1
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
* [toml11] fixes installation
* Update ports/toml11/CONTROL
Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>
* fix build issues occurring from default bazel config being used because customized bazel config is stored in wrong directory
* [tensorflow-cc] Update CONTROL and ci.baseline.txt
* fix also applies to windows static build
* fix debug and static builds as well as library naming for non-linux
- add patch to fix debug builds
- add patch to fix exports for static linking
- really build debug (instead of cloning release)
- override bazel build options for debug (work around bazel bug)
- bazel doesn't support static libraries: work around by building dynamic library and constructing static linkage commands from build log
- Windows .pdb file can't be >4GB even on x64: work around using reduced debug information
- Windows doesn't support .lib files >4GB even on x64, so split into multiple libs
- vcpkg requires equal amount of libs for debug and release: work around using handcrafted empty dummy libs
- fix naming of libs (.dll on Windows and .dylib on macOS)
* upgrade tensorflow from v1.14 to v2.3
- adapt patch files to tensorflow code changes
- update bazel from v0.25.2 to v3.1
- on Windows use python installed on the host instead of embedded python obtained via vcpkg because embedded python lacks pip, which we need to obtain numpy
- on Windows add MSYS2 to the PATH so that bazel tools can access MSYS2 GIT
- add support for custom CA certificates when using HTTPS_PROXY
* fix execute process macro
The existing implementation totally screwed up commands if the command's arguments contained semicolons (this is the case, e.g., in the FindPython modules of the cmake distribution).
* extend overriden execute_process to more than one COMMAND as there actually are use cases for this
* added another patch required for tensorflow v2.3, fixed path and working directory
* Revert "incorporate changes from microsoft:master"
* Revert "Revert "incorporate changes from microsoft:master""
* final fixes for static build + improving out messages
* enabling linux and osx in CI to see if it works now
* simplified code, fixed version numbers, fixed generated include cmake file
* fix failing postbuild check on handcrafted empty dummy library by spreading the last real libraries contents over the required number of libraries
* remove dead code commit by mistake again
* improvements from code review
* cleaner fix for debug code
* find pip3 in PATH (PYTHON3_DIR apparently not valid for pip3)
* fix error in python helper script
* fix wrong libname in postbuild script
* fix python detection + switch to python on msys2 (instead of embedded python) for Windows as we need numpy
* fix order of arguments
* fix command (it may contain spaces such as C:\Program Files\...)
* revert last commit (root cause for CI failures is something different: there are line breaks in path)
* fix regex comparision
(value needs to be escaped as it may contains regex special characters such as brackets, eg C:/Program Files (x86)/...)
* fix linebreaks in generated file
* fix CRT linkage
(macOS doesn't support static CRT linkage; it's set to dynamic even static target triplets for macOS and linux)
* refactor implemenation to avoid as much code duplication as possible -- algorithmically identical
* fix version numbers in helper scripts
* enable work-around for Windows until bazel fix is available
* install missing python3-pip on linux
* fix linux build by patching
* apply timeout feature now available via merged master branch
* correct linux build patch
* improve debug build patches
(no functional difference because LOG(FATAL, ...) macro internally anyway calls abort(), which the compiler doesn't detect in debug mode...
* improve linux patch
* temporarily add debug to inspect what's going on on macOS CI
* remove temporary debug code and fix static linking scripts for linux and macOS
* fix regex escaping
* fix ambiguous match while grepping for the framework link command
* extend fix of ambiguous match while grepping for the framework link command
* fix what merge of master broke
* fix more what got broken by merging master
(all packages and their dependencies are now maintained manually instead of using pacman...)
* remove "unofficial" from filename
* added switch do distinct classic and manifest mode when generating config.cmake file
* create symlinks for libraries without version number
* fix linux postbuild script
* temporarily disable code making problems
* add note for linking on Linux and macOS
* forget to add README file in previous commit
* add file forgotton in macro fixing patch
* fix python library path
* fix macOS static link command
* update linkage instructions in README
* Update ports/tensorflow-cc/CONTROL
* Update ports/tensorflow-cc/portfile.cmake
* Update scripts/ci.baseline.txt
* use vcpkg_execute_required_process
* pass C_FLAGS and CXX_FLAGS to bazel
* fix INTERFACE_INCLUDE_DIRECTORIES
* fix optional c/cxx arguments
* also add linker opts
* update README
* merge static libs into one
to support force_load (cannot force_load both due to duplicate symbols)
* update README
* quote python path (it might contain spaces that don't get escaped inside outer quotes of bash command)
* fix python path also for static build
* add arm(64) as currently unsupported arch
* bazel 3.7 is available -> remove workaround
* update README, remove necessary c-ares from deps
* update msys package
* add uwp specific options, and minor general improvements
* fix string replace
* fix control file and windows path separator
* revert backslashes-fix -- the root cause was missing .exe extension
* upgrade to tf 2.3.1
* fix hard-coded version
* remove uwp work-in-progress code so that PR can be merged
* add [tensorflow] C API port
* missing in previous commit
* fix include file
* remove unnecessary suffix
* update README and print out usage info in portfile
* Update ports/tensorflow-cc/CONTROL
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update ports/tensorflow/portfile.cmake
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* follow-up to code review
* fix suffix parameter
* fix quoting
* extend linux patch
* another try to fix quoting of possibly empty string parameter
* different approach to fix empty string arguments
* update list of headers for tensorflow 2.3.1 (was still 2.3.0)
* Update ports/tensorflow/CONTROL
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* move common stuff into tensorflow-common as discussed in review
* Apply suggestions from code review
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Gehweiler <Joachim_Gehweiler@McAfee.com>
Co-authored-by: wangli28 <wangli28@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Joachim Gehweiler <joachim@Joachims-iMac.local>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* add option PREFER_NMAKE to vcpkg_build_qmake and install_qt.
* Add /MP to qt5-base/vcpkg_build_qmake.
* use VCPKG_QMAKE_USE_NMAKE instead of as function parameter.
* Update ports/qt5-base/cmake/install_qt.cmake
* Update scripts/cmake/vcpkg_build_qmake.cmake
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* libdatachannel port
* Fixed various things for pr.
* Update to v0.9.2
* Update to 0.9.4 and enable SRTP feature
* Add openssl dependency
* Fix usrsctp find_library
* Flip the sense of the websockets feature and use a manifest instead of CONTROL file.
* Need to update libjuice and libdatachannel but there is now a USE_SRTP option.
* Update libdatachannel for USE_SRTP Option
* Update libdatachannel to v0.10.1
Co-authored-by: Nemirtingas <nanaki89@hotmail.fr>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Adding an install command override for dependencies
* Apply suggestions from code review
Use variables directly instead of prefixing with `${}` as is done in rest of the file. Thanks @shatur95
Co-authored-by: Hennadii Chernyshchyk <genaloner@gmail.com>
* Update scripts/buildsystems/vcpkg.cmake
Co-authored-by: Hennadii Chernyshchyk <genaloner@gmail.com>
Co-authored-by: Hennadii Chernyshchyk <genaloner@gmail.com>
* Fix pkgconfig for windows debug build. Re-allow tool feature on non windows platforms
* Fix tool feature
* Modified debug/release prvate libs according to https://github.com/microsoft/vcpkg/pull/14350#discussion_r520444862
Added vcpkg_fixup_pkgconfig() according to https://github.com/microsoft/vcpkg/pull/14350#discussion_r520435718
* Delete portfile.cmake.orig
* Fix pkgconfig
* Revert "Fix pkgconfig"
This reverts commit cb4da8bcc5e92248c20065f34d5e5d1d88a0e5d4.
* Bump port version to 3
* add missing system libs for windows. made case type coherent for ws2_32
* Fix build on x64-linux triplet
* Reverted ws2_32 to Ws2_32 as discudssed in https://github.com/microsoft/vcpkg/pull/14350#discussion_r525893479
* More fixes for Linux build with features
* Fix for feature c-ares
* Formatting
Co-authored-by: Phoebe Ma <v-phma@microsoft.com>
* [camport3] add new port: https://github.com/percipioxyz/camport3
* Removes no longer needed include
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* using VCPKG_TARGET_IS_WINDOWS and VCPKG_TARGET_IS_LINUX
fails if installed on OSX
* Update ports/camport3/CONTROL
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* unsupported targets and architectures added to control and portfile
* Update ports/camport3/CONTROL
* fixes supports string in control file
* Apply suggestions from code review
this port doesn't support UWP
Co-authored-by: Ivan Bravo <tecnic@robinteg.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* Use IncludePath and LibraryPath properties
These tool agnostic properties allow to configure ClCompile and ResourceCompile without repeating the code.
This change includes my changes from #4454.
* Applied changes as described in #13753
* Fixed warning and error in vcpkg end-to-end tests
* Fixed incorrect warning "we found a manifest file in \."
* Fixed still failing integration test. See discussion in #13753.
* Code Review Correction
Removed stray double quote reported by @strega-nil
* change display name
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [arrayfire] New Port
* Format manifest file
* Remove nvidia cub, forge, and spdlog submodules and use vcpkg ports - add patch
* Remove arrayfire/assets and don't build examples
* Remove arrayfire/glad submodule, use port, update patch
* Add optional freeimage dependency for graphics lib
* Remove rename of arrayfire threads/pass path to build
* Update ports/arrayfire/portfile.cmake
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* Fix up cmake targets files, install bin/dlls to the proper location
* Use debug bin dir if in debug mode
* Fixes for unified, Windows dlls, and more
- Make the unified backend its own feature
- Make the unified and CPU backend default features
- Conditionally create a bin directory if a Windows non-static build for the unified dll
- Remove fftw dependency (relies on MKL)
- Only support x64
* Add warning for Windows static builds
* Ensure CMake assets are in the proper dir for non-Windows builds
* Actually, don't change cmake targets in non-Windows systems
* Remove port-version
* Use MKL for CPU and OpenCL backends
* Patch arrayfire/threads - fix duplicate include
* Use newer af/threads, replace include path to fix Windows builds
* Fix binary dir for output DLLs
* Update select_compute_arch to work with CUDA 11
* Don't include CUB if using CUDA >= 11
* Bump port verison to 3.7.3 to handle CUDA 11+
* Update port to use 3.7.3
* Update to include MSVC 2019 fixes, fixup CMake targets on *nix
* Apply suggestions from code review
* Update ports/arrayfire/portfile.cmake
* Change AF CMake dir since targets.cmake are included by other targets
* Bump to commit with fixed AF version for bits
The v3.7 branch tip was still outputting shared objects with 3.7.2 versions attached to them. It's now fixed
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* Updated ports/seal to version 3.6.0. Changed default features. Supported linux and *-windows-static. macOS is not tested but should work.
* Changed to use vcpkg_check_features and VCPKG_TARGET_IS_WINDOWS. Updated SEAL's commit hash to keep up-to-date with SEAL's new fixes.
* Removed one unnecessary cmake argument.
* Disabled parallel configure.
* Updated SEAL's commit hash.
* Enforced static linkage.
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update ports/seal/portfile.cmake
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* [BLAS] add metaport
* [openblas] enable also on macOS to allow lapack-reference previous setup
* [clapack] bump port version
* [blas, lapack] Remove incorrect comments about "outside vcpkg"
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>