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

Jump to bottom

ign_common windows: use gdal #624

Merged
merged 5 commits into from
Jan 21, 2022
Merged

ign_common windows: use gdal #624

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24f7468
ign_rendering windows: use gdal
scpeters Jan 19, 2022
9532173
ign_common windows: use gdal
scpeters Jan 20, 2022
eea5dfb
Merge branch 'master' into ci_matching_branch/require_geospatial
scpeters Jan 20, 2022
78d153a
Use --recurse with vcpkg install
scpeters Jan 20, 2022
0bf9af5
Add gdal dependency to other windows CI scripts
scpeters Jan 21, 2022
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/ign_common-default-devel-windows-amd64.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ set PLATFORM_TO_BUILD=x86_amd64
set IGN_CLEAN_WORKSPACE=true

set DEPEN_PKGS=ffmpeg freeimage gts tinyxml2
for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i
if %IGN_MAJOR_VERSION% GEQ 5 (
set DEPEN_PKGS=%DEPEN_PKGS% gdal
)

set COLCON_PACKAGE=ignition-common
set COLCON_AUTO_MAJOR_VERSION=true

Expand Down
5 changes: 4 additions & 1 deletion jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ set VCS_DIRECTORY=ign-rendering
set PLATFORM_TO_BUILD=x86_amd64
set IGN_CLEAN_WORKSPACE=true

set DEPEN_PKGS=boost-core dlfcn-win32 cuda eigen3 freeimage ogre ogre2 gts glib
set DEPEN_PKGS=boost-core cuda dlfcn-win32 eigen3 freeimage glib gts ogre ogre2
for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i
if %IGN_MAJOR_VERSION% GEQ 5 (
set DEPEN_PKGS=%DEPEN_PKGS% ogre22
)
if %IGN_MAJOR_VERSION% GEQ 7 (
set DEPEN_PKGS=%DEPEN_PKGS% gdal
)

:: This needs to be migrated to DSL to get multi-major versions correctly
set COLCON_PACKAGE=ignition-rendering
Expand Down