Skip to content

Commit

Permalink
Fix support for consuming YCM via FetchContent_MakeAvailable and bump…
Browse files Browse the repository at this point in the history
… version to 0.17.1 (#464)
  • Loading branch information
traversaro authored Nov 9, 2024
1 parent b1c62ba commit 35eede5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/conda-forge-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@ jobs:
matrix:
build_type: [Release]
os: [ubuntu-latest, windows-2019, macos-latest]
cmake_version: ["3.16","3.18","3.21","3.23","latest"]
cmake_version: ["3.18","3.21","3.23","latest"]
fail-fast: false

steps:
- uses: actions/checkout@v2

- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest

- name: Dependencies
Expand All @@ -35,7 +34,7 @@ jobs:
# Workaround for https://github.com/conda-incubator/setup-miniconda/issues/186
conda config --remove channels defaults
# Compilation related dependencies
mamba install compilers make ninja pkg-config
conda install compilers make ninja pkg-config
- name: CMake [Latest]
shell: bash -l {0}
Expand All @@ -47,14 +46,14 @@ jobs:
shell: bash -l {0}
if: matrix.cmake_version != 'latest'
run: |
mamba install cmake=${{ matrix.cmake_version }}
conda install cmake=${{ matrix.cmake_version }}
- name: Windows-only Dependencies [Windows]
if: contains(matrix.os, 'windows')
shell: bash -l {0}
run: |
# Compilation related dependencies
mamba install vs2019_win-64
conda install vs2019_win-64
- name: Configure [Linux&macOS]
if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
Expand Down
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@


cmake_minimum_required(VERSION 3.16)
project(YCM VERSION 0.17.0 LANGUAGES NONE)
project(YCM VERSION 0.17.1 LANGUAGES NONE)

# Check if the project is the main project or included via FetchContent
if (NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
# Project is included via FetchContent
include(${CMAKE_CURRENT_SOURCE_DIR}/tools/UseYCMFromSource.cmake)
# Propagate relevant variables modified by UseYCMFromSource to who called add_subdirectory
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE)
set(__USEYCMFROMSOURCE_INCLUDED ${__USEYCMFROMSOURCE_INCLUDED} PARENT_SCOPE)
set(YCM_MODULE_DIR ${YCM_MODULE_DIR} PARENT_SCOPE)
return()
endif()

Expand Down

0 comments on commit 35eede5

Please sign in to comment.