From a5729da4e988f0769e0cdf54ce034ca0ff8a8481 Mon Sep 17 00:00:00 2001 From: jmackay2 <1.732mackay@gmail.com> Date: Tue, 10 Sep 2024 05:53:00 -0400 Subject: [PATCH] Simplify gz bridge CMakeLists and add GZ Ionic (#23657) Co-authored-by: jmackay2 --- src/modules/simulation/gz_bridge/CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/modules/simulation/gz_bridge/CMakeLists.txt b/src/modules/simulation/gz_bridge/CMakeLists.txt index 0d1e8eed66..2af0a069b3 100644 --- a/src/modules/simulation/gz_bridge/CMakeLists.txt +++ b/src/modules/simulation/gz_bridge/CMakeLists.txt @@ -32,13 +32,8 @@ ############################################################################ # Find the gz_Transport library -# First look for GZ Harmonic libraries -find_package(gz-transport NAMES gz-transport13) - -# If Harmonic not found, look for GZ Garden libraries -if(NOT gz-transport_FOUND) - find_package(gz-transport NAMES gz-transport12) -endif() +# Look for GZ Ionic, Harmonic, and Garden library options in that order +find_package(gz-transport NAMES gz-transport14 gz-transport13 gz-transport12) if(gz-transport_FOUND)