Skip to content

Commit 88464ce

Browse files
scpetersscpeters
authored
Bump gz-cmake and others in jetty (#675)
Bumping gz-cmake and others except gz-tools. Also disables jammy CI. Signed-off-by: Steve Peters <[email protected]>
1 parent e6bc93b commit 88464ce

File tree

16 files changed

+46
-62
lines changed

16 files changed

+46
-62
lines changed

‎.github/ci/packages.apt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ libavformat-dev
55
libavutil-dev
66
libfreeimage-dev
77
libgdal-dev
8-
libgz-cmake4-dev
9-
libgz-math8-dev
10-
libgz-utils3-dev
11-
libgz-utils3-log-dev
8+
libgz-cmake5-dev
9+
libgz-math9-dev
10+
libgz-utils4-dev
11+
libgz-utils4-log-dev
1212
libspdlog-dev
1313
libswscale-dev
1414
libtinyxml2-dev

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,6 @@ on:
99
- 'main'
1010

1111
jobs:
12-
jammy-ci:
13-
runs-on: ubuntu-latest
14-
name: Ubuntu Jammy CI
15-
steps:
16-
- name: Checkout
17-
uses: actions/checkout@v4
18-
- name: Compile and test
19-
id: ci
20-
uses: gazebo-tooling/action-gz-ci@jammy
21-
with:
22-
codecov-enabled: true
2312
noble-ci:
2413
runs-on: ubuntu-latest
2514
name: Ubuntu Noble CI

‎.github/workflows/macos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
build:
1313
env:
14-
PACKAGE: gz-common6
14+
PACKAGE: gz-common7
1515
runs-on: macos-latest
1616
steps:
1717
- uses: actions/checkout@v4
@@ -47,7 +47,7 @@ jobs:
4747
popd
4848
echo '# END SECTION'
4949
fi
50-
# gz-math8 has problems with swig, remove it for now
50+
# gz-math9 has problems with swig, remove it for now
5151
brew remove swig || true
5252
brew install --only-dependencies ${PACKAGE};
5353
- run: mkdir build

‎CMakeLists.txt‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
33
#============================================================================
44
# Initialize the project
55
#============================================================================
6-
project(gz-common7 VERSION 7.0.0)
7-
set(GZ_COMMON_VER ${PROJECT_VERSION_MAJOR})
6+
project(gz-common VERSION 7.0.0)
87

98
#============================================================================
109
# Find gz-cmake
1110
#============================================================================
12-
find_package(gz-cmake4 REQUIRED)
13-
set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})
11+
find_package(gz-cmake REQUIRED)
1412

1513
#============================================================================
1614
# Configure the project
@@ -39,13 +37,11 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======")
3937

4038
#--------------------------------------
4139
# Find gz-math
42-
gz_find_package(gz-math8 REQUIRED_BY geospatial graphics events)
43-
set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})
40+
gz_find_package(gz-math REQUIRED_BY geospatial graphics events)
4441

4542
#--------------------------------------
4643
# Find gz-utils
47-
gz_find_package(gz-utils3 REQUIRED COMPONENTS log)
48-
set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
44+
gz_find_package(gz-utils REQUIRED COMPONENTS log)
4945

5046
#--------------------------------------
5147
# Find Tinyxml2

‎av/src/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ gz_build_tests(
2626
SOURCES ${gtest_sources}
2727
LIB_DEPS
2828
${av_target}
29-
gz-common${GZ_COMMON_VER}-testing
29+
gz-common-testing
3030
)

‎events/src/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ gz_add_component(events SOURCES ${sources} GET_TARGET_NAME events_target)
44

55
target_link_libraries(${events_target}
66
PUBLIC
7-
gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER})
7+
gz-math::gz-math)
88

99
gz_build_tests(
1010
TYPE UNIT
1111
SOURCES ${gtest_sources}
1212
LIB_DEPS
1313
${events_target}
14-
gz-common${GZ_COMMON_VER}-testing
14+
gz-common-testing
1515
)

‎examples/CMakeLists.txt‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,23 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
33
project(gz-common-examples)
44

55
# Find the gz-common library
6-
find_package(gz-common7 QUIET REQUIRED COMPONENTS events profiler)
7-
set(GZ_COMMON_VER ${gz-common7_VERSION_MAJOR})
6+
find_package(gz-common QUIET REQUIRED COMPONENTS events profiler)
87

98
add_executable(assert_example assert_example.cc)
10-
target_link_libraries(assert_example gz-common${GZ_COMMON_VER}::core)
9+
target_link_libraries(assert_example gz-common::core)
1110

1211
add_executable(console_example console.cc)
13-
target_link_libraries(console_example gz-common${GZ_COMMON_VER}::core)
12+
target_link_libraries(console_example gz-common::core)
1413

1514
add_executable(events_example events.cc)
16-
target_link_libraries(events_example gz-common${GZ_COMMON_VER}::events)
15+
target_link_libraries(events_example gz-common::events)
1716

1817
add_executable(profiler_example profiler.cc)
19-
target_link_libraries(profiler_example gz-common${GZ_COMMON_VER}::profiler)
18+
target_link_libraries(profiler_example gz-common::profiler)
2019
target_compile_definitions(profiler_example PUBLIC "GZ_PROFILER_ENABLE=1")
2120

2221
add_executable(logging_performance logging_performance.cc)
23-
target_link_libraries(logging_performance gz-common${GZ_COMMON_VER}::core)
22+
target_link_libraries(logging_performance gz-common::core)
2423

2524
add_executable(util_example util.cc)
26-
target_link_libraries(util_example gz-common${GZ_COMMON_VER}::core)
25+
target_link_libraries(util_example gz-common::core)

‎geospatial/src/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ if (TARGET ${PROJECT_LIBRARY_TARGET_NAME}-graphics)
88
target_link_libraries(${geospatial_target}
99
PUBLIC
1010
${PROJECT_LIBRARY_TARGET_NAME}-graphics
11-
gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER}
12-
gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER}
11+
gz-math::gz-math
12+
gz-utils::gz-utils
1313
PRIVATE
1414
${GDAL_LIBRARY})
1515

@@ -20,7 +20,7 @@ if (TARGET ${PROJECT_LIBRARY_TARGET_NAME}-graphics)
2020
gz_build_tests(TYPE UNIT SOURCES ${gtest_sources}
2121
LIB_DEPS
2222
${geospatial_target}
23-
gz-common${GZ_COMMON_VER}-testing
23+
gz-common-testing
2424
)
2525
else()
2626
message(WARNING "Skipping component [geospatial]: Missing component [graphics].\n ^~~~~ Set SKIP_geospatial=true in cmake to suppress this warning.")

‎graphics/src/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ gz_add_component(graphics SOURCES ${sources} GET_TARGET_NAME graphics_target)
44

55
target_link_libraries(${graphics_target}
66
PUBLIC
7-
gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER}
8-
gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER}
7+
gz-math::gz-math
8+
gz-utils::gz-utils
99
PRIVATE
1010
${GzAssimp_LIBRARIES}
1111
FreeImage::FreeImage
@@ -23,7 +23,7 @@ gz_build_tests(
2323
SOURCES ${gtest_sources}
2424
LIB_DEPS
2525
${graphics_target}
26-
gz-common${GZ_COMMON_VER}-testing
26+
gz-common-testing
2727
TINYXML2::TINYXML2
2828
)
2929

‎io/src/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ gz_add_component(io SOURCES ${sources} GET_TARGET_NAME io_target)
44

55
target_link_libraries(${io_target}
66
PUBLIC
7-
gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER})
7+
gz-math::gz-math)
88

99
gz_build_tests(
1010
TYPE UNIT
1111
SOURCES ${gtest_sources}
1212
LIB_DEPS
1313
${io_target}
14-
gz-common${GZ_COMMON_VER}-testing
14+
gz-common-testing
1515
)

0 commit comments

Comments
 (0)