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.

Sign up for GitHub

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

Update to cmake v3.17.0 #115

Merged
merged 13 commits into from
Mar 27, 2020
Merged

Update to cmake v3.17.0 #115

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
72e3ec7
Update to cmake v3.17.0
trxcllnt Mar 23, 2020
65d057d
remove patches
trxcllnt Mar 24, 2020
c7bb8b1
Delete 0001-find_-Add-debug-logging-infrastructure.patch
trxcllnt Mar 24, 2020
0ade762
Delete 0002-find_-Use-debug-logging-infrastructure.patch
trxcllnt Mar 24, 2020
245bec9
Delete 0003-Add-more-debug-logging-to-cmFindCommon.patch
trxcllnt Mar 24, 2020
413701e
Skip fixing prefixes in a macOS file on Linux
jakirkham Mar 26, 2020
955ceb6
Update build_steps.sh to install conda-build<3.18
trxcllnt Mar 26, 2020
b31f3bb
Update build_steps.sh
trxcllnt Mar 26, 2020
ea7b926
Update .scripts/build_steps.sh
trxcllnt Mar 26, 2020
e648475
Revert "Skip fixing prefixes in a macOS file on Linux"
jakirkham Mar 27, 2020
90b1f94
Merge conda-forge/master into trxcllnt/patch-1
jakirkham Mar 27, 2020
acb85ed
MNT: Re-rendered with conda-build 3.19.1, conda-smithy 3.6.15, and co…
Mar 27, 2020
72e3458
Revert "MNT: Re-rendered with conda-build 3.19.1, conda-smithy 3.6.15…
jakirkham Mar 27, 2020
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
4 changes: 2 additions & 2 deletions .scripts/build_steps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ conda-build:

CONDARC

conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge
conda install --yes --quiet conda-forge-ci-setup=2 "conda-build<3.18" -c conda-forge
trxcllnt marked this conversation as resolved.
Show resolved Hide resolved

# set up the condarc
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
Expand All @@ -36,4 +36,4 @@ if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then
upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
fi

touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}"
touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}"
10 changes: 4 additions & 6 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
{% set version = "3.16.4" %}
{% set version = "3.17.0" %}

package:
name: cmake
version: {{ version }}

source:
url: https://gitlab.kitware.com/cmake/cmake/-/archive/v{{ version }}/cmake-v{{ version }}.tar.bz2
sha256: 40e0dec6dc9e36820e001b8425aa4328a0b42f1915b14d68aee116e25c3d34df
patches:
- patches/3.16.2/0001-find_-Add-debug-logging-infrastructure.patch
- patches/3.16.2/0002-find_-Use-debug-logging-infrastructure.patch
- patches/3.16.2/0003-Add-more-debug-logging-to-cmFindCommon.patch
trxcllnt marked this conversation as resolved.
Show resolved Hide resolved
sha256: 9791a8ff223ffbecc5a8985d4a623be8bff037881356f7147fa616e18c23f8c6
# Not until Python 3.8 on Windows: https://github.com/WorksApplications/SudachiPy/issues/107#issuecomment-564510365
# path: 'C:/opt/Shared.local/src/cmake'
# path_via_symlink: True
Expand All @@ -25,6 +21,8 @@ build:
skip: True # [win and vc<14]
ignore_run_exports:
- vc
ignore_prefix_files:
- share/cmake-3.17/Modules/Internal/CPack/CPack.OSXScriptLauncher.in # [linux]

requirements:
build:
Expand Down
Loading