Skip to content

Commit fa24330

Browse files
authored
Fix calling ycm_ep_helper when YCM is consumed via find_package(YCM) and add test (#468)
1 parent 69fbc71 commit fa24330

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

.github/workflows/conda-forge-ci.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
mkdir -p build
6363
cd build
6464
cmake -GNinja -DBUILD_TESTING:BOOL=ON -DFRAMEWORK_COMPILE_IK:BOOL=OFF \
65-
-DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ..
65+
-DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX ..
6666
6767
- name: Build [Linux&macOS]
6868
if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
@@ -84,7 +84,7 @@ jobs:
8484
run: |
8585
mkdir -p build
8686
cd build
87-
cmake -GNinja -DBUILD_TESTING:BOOL=ON -DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ..
87+
cmake -GNinja -DBUILD_TESTING:BOOL=ON -DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ..
8888
8989
- name: Build [Windows]
9090
if: contains(matrix.os, 'windows')
@@ -99,3 +99,20 @@ jobs:
9999
run: |
100100
cd build
101101
ctest --output-on-failure -C ${{ matrix.build_type }} -E "Bootstrap"
102+
103+
- name: Install
104+
shell: bash -l {0}
105+
run: |
106+
cd build
107+
cmake --install .
108+
109+
- name: Integration test run a configure of the robotology-superbuild
110+
shell: bash -l {0}
111+
run: |
112+
mkdir testint
113+
cd testint
114+
git clone https://github.com/robotology/robotology-superbuild/
115+
cd robotology-superbuild/
116+
git config --global user.name CI User
117+
git config --global user.email ciuser@example.com
118+
cmake -Bbuild -S.

modules/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ set(YCM_MODULES AddInstallRPATHSupport.cmake
1616
_ycm_install(modules FILES ${YCM_MODULES}
1717
DESTINATION "${YCM_INSTALL_MODULE_DIR}/modules")
1818

19+
set(YCMEPHELPER_FILES YCMEPHelper/RepositoryInfo.txt.in
20+
YCMEPHelper/gitsafeclone.txt.in)
21+
22+
_ycm_install(modules FILES ${YCMEPHELPER_FILES}
23+
DESTINATION "${YCM_INSTALL_MODULE_DIR}/modules/YCMEPHelper")
24+
1925
# Print a warning if we are overriding some module from CMake
2026
foreach(_module IN LISTS YCM_MODULES)
2127
if(EXISTS "${CMAKE_ROOT}/Modules/${_module}")

0 commit comments

Comments
 (0)