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

Enable GZ_ENABLE_RELOCATABLE_INSTALL in CI for gz-cmake3 #964

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
5 changes: 5 additions & 0 deletions jenkins-scripts/docker/gz_cmake-compilation.bash
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ if ! [[ ${GZ_CMAKE_MAJOR_VERSION} =~ ^-?[0-9]+$ ]]; then
exit -1
fi


if [ "${GZ_CMAKE_MAJOR_VERSION}" -ge 3 ]; then
BUILDING_EXTRA_CMAKE_PARAMS+=" -DGZ_ENABLE_RELOCATABLE_INSTALL=True"
fi

export GZDEV_PROJECT_NAME="gz-cmake${GZ_CMAKE_MAJOR_VERSION}"

. ${SCRIPT_DIR}/lib/generic-building-base.bash
6 changes: 6 additions & 0 deletions jenkins-scripts/ign_cmake-default-devel-windows-amd64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,10 @@ set COLCON_PACKAGE=gz-cmake
set COLCON_AUTO_MAJOR_VERSION=true
set COLCON_PACKAGE_EXTRA_CMAKE_ARGS="-DBUILDSYSTEM_TESTING:BOOL=True"

setlocal ENABLEDELAYEDEXPANSION
for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set PKG_MAJOR_VERSION=%%i
if !PKG_MAJOR_VERSION! gtr 3 (
set COLCON_PACKAGE_EXTRA_CMAKE_ARGS="%COLCON_PACKAGE_EXTRA_CMAKE_ARGS% -DGZ_ENABLE_RELOCATABLE_INSTALL=True"
)

call "%SCRIPT_DIR%\lib\colcon-default-devel-windows.bat"