Commit Graph

14 Commits

Author SHA1 Message Date
Kai Pastor
233f096536
[vcpkg-cmake-config] Fix fixup of ) paths ()
Cherry-picked from https://github.com/microsoft/vcpkg/pull/38847:

Fix processing of `INTERFACE_LINK_LIBS` when it contain `)` inside `"`,
e.g. for
`C:/Program Files (x86)/Windows
Kits/10/Lib/10.0.22621.0/um/x64/User32.Lib`
created by `pkg_check_modules` from `-luser32` as found in icu pc files.

Without the fix, the property is not processed at all, pulling release
libs into debug builds.
2024-06-06 01:25:03 -07:00
Robert Schumacher
7d2449c346
[docs] Delete embedded documentation in favor of docs/ ()
* [docs] Delete embedded documentation in favor of docs/

Drive-by for the helper ports:
1. "documentation": "https://vcpkg.io/en/docs/README.html"
2. "license": "MIT"
3. Use `include_guard(GLOBAL)` in all script files
4. Make sure any persistent variables are saved to the cache

* [docs] Restore empty regenerate.ps1 to satisfy Azure Pipelines

* [docs] PR comments
2022-06-07 16:26:51 -07:00
Kai Pastor
3565cab797
[vcpkg-cmake-config] Merge INTERFACE_LINK_LIBRARIES configurations ()
* Merge INTERFACE_LINK_LIBRARIES configurations

Direct references to binaries must match the active build type when used.

* Update tmx for cmake_config_fixup

* Update versions

* Prevent repeated fixup of the same file

* Don't change line structure

* Update versions

* CI

* Apply CR suggestion

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update versions

* Fixup CR suggestion

* Update versions

* Update versions

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2022-02-18 13:54:55 -08:00
Alexander Neumann
3e13256799
[vcpkg-cmake-config] add missing TOOLS_PATH ()
* add missing parameter to vcpkg-cmake-config

* version stuff

* apply format diff

* ci retrigger

* CI retrigger
2022-02-03 11:12:33 -08:00
Laurent Rineau
95d4d067f0
[vcpkg] Fix vcpkg_cmake_config_fixup.cmake ()
* Fix vcpkg_cmake_config_fixup.cmake

The PR  exposed a bug in `vcpkg_cmake_config_fixup.cmake`, that
incorrectly preprends a string without a end-of-line. That creates
CMake syntax errors, like this one:

```
get_filename_component(VCPKG_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)set(CGAL_ROOT ${VCPKG_IMPORT_PREFIX})
```

The fix is simple: add a `\n` at the end of the prepended string.

* format manifest

* Update versions
2021-12-29 13:19:10 -08:00
Phoebe
77967a6228
[vcpkg-cmake-config] fix up cmake_current_packages_dir ()
* [vcpkg-cmake-config] fix up cmake_current_packages_dir

* Small changes

* Address the review suggestion

* Update ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake

* Update the baseline version

* Address the review suggestions

* Address the review suggestions

* fix up VCPKG_IMPORT_PREFIX if the file being modified at a deep subpath

* Fix regressions

* Remove out of date comments about multiconfig generators that are no longer relevant, fix spelling errors, and avoid calculating relative paths for the definition of VCPKG_IMPORT_PREFIX when not used.

* Fix version database.

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-12-09 14:24:16 -08:00
Osyotr
52fd7e4a64
[vcpkg-cmake-config] Fix parsing of NO_PREFIX_CORRECTION () 2021-11-08 21:29:35 -08:00
Phoebe
042e1db92d
[vcpkg_cmake_config_fixup] Fix variable name ()
* [vcpkg_cmake_config_fixup] Fix variable name

* Fix vcpkg.json
2021-09-27 21:11:50 -07:00
Phoebe
025e564979
[vcpkg baseline][paraview:x64-osx][vcpkg_cmake_config_fixup] Revert ()
* [vcpkg_cmake_config_fixup] Revert 

* Update the version date

* actually just revert

* move stuff around in vcpkg-cmake-config.json file

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-08-20 14:46:02 -07:00
nicole mazzuca
99e06a64ec
[rollup:2021-08-09] Rollup PR ()
* [rollup:2021-08-09] PR  (@JackBoosY)

[vcpkg_fixup_cmake_targets] Fix up OSX system development path

* [rollup:2021-08-09] PR  (@strega-nil)

[scripts-audit] vcpkg_download_distfile

* [rollup:2021-08-09] PR  (@strega-nil)

[scripts-audit] vcpkg_find_fortran

* [rollup:2021-08-09] PR  (@strega-nil)

[tinyfiledialogs] Fix for good

* [rollup:2021-08-09] PR  (@strega-nil)

[scripts-audit] vcpkg_fixup_pkgconfig

* fix ports.cmake with newer vcpkg_download_distfile

* fix vcpkg create

* move vcpkg_common_definitions down so that it's not incorrect

* fix vcpkg_internal_get_cmake_vars

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-08-16 13:42:31 -07:00
nicole mazzuca
d369df7ecf
[rollup:2021-07-06] Rollup PR ()
* [rollup:2021-07-06 1/8] PR  (@strega-nil)

[scripts-audit] vcpkg_from_*

* [rollup:2021-07-06 2/8] PR  (@strega-nil)

[scripts-audit] add guidelines for cmake

* [rollup 2021-07-06 3/8] PR  (@mheyman)

[vcpkg-cmake-config] documentation fix

* [rollup:2021-07-06 4/8] PR  (@strega-nil)

[scripts-audit] vcpkg_execute_*

* [rollup:2021-07-06 5/8] PR  (@strega-nil)

[scripts-audit] vcpkg_extract_source_archive

* [rollup:2021-07-06 6/8] PR  (@NancyLi1013)

[vcpkg doc] Update examples

* [rollup:2021-07-06 7/8] PR  (@JackBoosY)

[vcpkg] Update the minimum version of vcpkg

* [rollup:2021-07-06 8/8] PR  (@ras0219-msft)

[vcpkg_from_git] Fix error if downloads folder does not exist

* build docs!

* fix bond:*-windows

* fix nmap

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Michael Heyman <Michael.Heyman@jhuapl.edu>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Robert Schumacher <ras0219@outlook.com>
2021-07-14 12:45:18 -07:00
Kai Pastor
8f6e982c35
[vcpkg-cmake-config] Fix removal of files in debug/share ()
* Actually remove *empty* directories

* Quote unused files individually

* New version

* x-add-version
2021-05-24 12:02:20 -07:00
nicole mazzuca
c8f6537b80
[ci,vcpkg-cmake-*] remove host-only nature of vcpkg-cmake-* ports ()
* remove host-only nature of vcpkg-cmake-* ports

* versions

* fix fmt on uwp
2021-03-18 15:06:03 -07:00
nicole mazzuca
3426db05b9
[scripts-audit] Rollup PR 2021-02-26 ()
* [scripts-audit rollup] PR 

* pull the cmake doc comment parsing out into its own function
* support cmake helper ports
* add real support for deprecation, as opposed to ad-hoc

* [scripts-audit rollup] PR 

* add a z_ in front of internal functions
* move internal functions out

set feature_vars again in parent scope

* [scripts-audit rollup] PR 

Audit vcpkg_copy_pdbs

* [scripts-audit rollup] PR 

* Fix usage, documentation

* [scripts-audit rollup] PR 

* [scripts-audit rollup] PR 

Deprecate `vcpkg_*_cmake` in favor of `vcpkg_cmake_*` from the
`vcpkg-cmake` port, as well as `vcpkg_fixup_cmake_targets`
in favor of `vcpkg_cmake_config_fixup` from the
`vcpkg-cmake-config` port.
2021-02-28 13:17:19 -08:00