examples: fix cmake find version variables (#340)

Use *_VERSION_MAJOR variables to aid search/replace scripts. Signed-off-by: Steve Peters <[email protected]>
gazebosim · Apr 12, 2022 · f99b7d4 · f99b7d4
1 parent c36aee7
commit f99b7d4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/examples/hello_world_loader/CMakeLists.txt b/examples/hello_world_loader/CMakeLists.txt
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 project(ign-physics-hello-world-loader)
 
-set(IGN_PLUGIN_VER 1)
-find_package(ignition-plugin${IGN_PLUGIN_VER} 1.1 REQUIRED COMPONENTS all)
+find_package(ignition-plugin1 1.1 REQUIRED COMPONENTS all)
+set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
 
-set(IGN_PHYSICS_VER 6)
-find_package(ignition-physics${IGN_PHYSICS_VER} REQUIRED)
+find_package(ignition-physics6 REQUIRED)
+set(IGN_PHYSICS_VER ${ignition-physics6_VERSION_MAJOR})
 
 add_executable(hello_world_loader hello_world_loader.cc)
 target_link_libraries(hello_world_loader

diff --git a/examples/hello_world_plugin/CMakeLists.txt b/examples/hello_world_plugin/CMakeLists.txt
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 project(ign-physics-hello-world-plugin)
 
-set(IGN_PLUGIN_VER 1)
-find_package(ignition-plugin${IGN_PLUGIN_VER} 1.1 REQUIRED COMPONENTS all)
+find_package(ignition-plugin1 1.1 REQUIRED COMPONENTS all)
+set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
 
-set(IGN_PHYSICS_VER 6)
-find_package(ignition-physics${IGN_PHYSICS_VER} REQUIRED)
+find_package(ignition-physics6 REQUIRED)
+set(IGN_PHYSICS_VER ${ignition-physics6_VERSION_MAJOR})
 
 add_library(HelloWorldPlugin SHARED HelloWorldPlugin.cc)
 target_link_libraries(HelloWorldPlugin

diff --git a/examples/simple_plugin/CMakeLists.txt b/examples/simple_plugin/CMakeLists.txt
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 project(ign-physics-simple-plugin)
 
-set(IGN_PLUGIN_VER 1)
-find_package(ignition-plugin${IGN_PLUGIN_VER} 1.1 REQUIRED COMPONENTS all)
+find_package(ignition-plugin1 1.1 REQUIRED COMPONENTS all)
+set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
 
-set(IGN_PHYSICS_VER 6)
-find_package(ignition-physics${IGN_PHYSICS_VER} REQUIRED)
+find_package(ignition-physics6 REQUIRED)
+set(IGN_PHYSICS_VER ${ignition-physics6_VERSION_MAJOR})
 
 add_library(SimplePlugin SHARED plugin.cc EntityManagementFeatures.cc)
 target_link_libraries(SimplePlugin