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

Fix calling ycm_ep_helper when YCM is consumed via find_package(YCM) and add test #468

Merged
merged 5 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 19 additions & 2 deletions .github/workflows/conda-forge-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
mkdir -p build
cd build
cmake -GNinja -DBUILD_TESTING:BOOL=ON -DFRAMEWORK_COMPILE_IK:BOOL=OFF \
-DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ..
-DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX ..

- name: Build [Linux&macOS]
if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
Expand All @@ -84,7 +84,7 @@ jobs:
run: |
mkdir -p build
cd build
cmake -GNinja -DBUILD_TESTING:BOOL=ON -DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ..
cmake -GNinja -DBUILD_TESTING:BOOL=ON -DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ..

- name: Build [Windows]
if: contains(matrix.os, 'windows')
Expand All @@ -99,3 +99,20 @@ jobs:
run: |
cd build
ctest --output-on-failure -C ${{ matrix.build_type }} -E "Bootstrap"

- name: Install
shell: bash -l {0}
run: |
cd build
cmake --install .

- name: Integration test run a configure of the robotology-superbuild
shell: bash -l {0}
run: |
mkdir testint
cd testint
git clone https://github.com/robotology/robotology-superbuild/
cd robotology-superbuild/
git config --global user.name CI User
git config --global user.email [email protected]
cmake -Bbuild -S.
6 changes: 6 additions & 0 deletions modules/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ set(YCM_MODULES AddInstallRPATHSupport.cmake
_ycm_install(modules FILES ${YCM_MODULES}
DESTINATION "${YCM_INSTALL_MODULE_DIR}/modules")

set(YCMEPHELPER_FILES YCMEPHelper/RepositoryInfo.txt.in
YCMEPHelper/gitsafeclone.txt.in)

_ycm_install(modules FILES ${YCMEPHELPER_FILES}
DESTINATION "${YCM_INSTALL_MODULE_DIR}/modules/YCMEPHelper")

# Print a warning if we are overriding some module from CMake
foreach(_module IN LISTS YCM_MODULES)
if(EXISTS "${CMAKE_ROOT}/Modules/${_module}")
Expand Down
Loading