From 9d6e4f45afd5f73aedf58eed102feb268c70832c Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Tue, 7 Jun 2022 17:10:47 -0700 Subject: [PATCH 1/3] ignition-utils2: Rename CMake project to gz-utils2 Signed-off-by: Louise Poubel --- Formula/ignition-utils2.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Formula/ignition-utils2.rb b/Formula/ignition-utils2.rb index 094567861..99995217c 100644 --- a/Formula/ignition-utils2.rb +++ b/Formula/ignition-utils2.rb @@ -23,14 +23,14 @@ def install test do (testpath/"test.cpp").write <<-EOS - #include + #include class SomeClassPrivate { }; class SomeClass { - private: ignition::utils::ImplPtr dataPtr = - ignition::utils::MakeImpl(); + private: gz::utils::ImplPtr dataPtr = + gz::utils::MakeImpl(); }; int main() { SomeClass object; @@ -39,7 +39,7 @@ class SomeClass EOS (testpath/"CMakeLists.txt").write <<-EOS cmake_minimum_required(VERSION 3.5 FATAL_ERROR) - find_package(ignition-utils2 QUIET REQUIRED) + find_package(gz-utils2 QUIET REQUIRED) add_executable(test_cmake test.cpp) target_link_libraries(test_cmake ${IGNITION-UTILS_LIBRARIES}) EOS From 1f6238fa0f66ea7f51b019326d69f11d529aabc2 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Tue, 7 Jun 2022 17:15:47 -0700 Subject: [PATCH 2/3] alias Signed-off-by: Louise Poubel --- Formula/ignition-utils2.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/ignition-utils2.rb b/Formula/ignition-utils2.rb index 99995217c..d7a5213d0 100644 --- a/Formula/ignition-utils2.rb +++ b/Formula/ignition-utils2.rb @@ -7,7 +7,7 @@ class IgnitionUtils2 < Formula depends_on "cmake" => [:build, :test] depends_on "pkg-config" => [:build, :test] - depends_on "ignition-cmake3" + depends_on "gz-cmake3" def install cmake_args = std_cmake_args From d769ff8010216e61353aed54443237a1ad75d612 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Wed, 15 Jun 2022 10:32:34 -0700 Subject: [PATCH 3/3] more gz Signed-off-by: Louise Poubel --- Formula/ignition-utils2.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Formula/ignition-utils2.rb b/Formula/ignition-utils2.rb index d7a5213d0..f4f4016bf 100644 --- a/Formula/ignition-utils2.rb +++ b/Formula/ignition-utils2.rb @@ -41,11 +41,11 @@ class SomeClass cmake_minimum_required(VERSION 3.5 FATAL_ERROR) find_package(gz-utils2 QUIET REQUIRED) add_executable(test_cmake test.cpp) - target_link_libraries(test_cmake ${IGNITION-UTILS_LIBRARIES}) + target_link_libraries(test_cmake gz-utils2::gz-utils2) EOS - system "pkg-config", "ignition-utils2" - cflags = `pkg-config --cflags ignition-utils2`.split - ldflags = `pkg-config --libs ignition-utils2`.split + system "pkg-config", "gz-utils2" + cflags = `pkg-config --cflags gz-utils2`.split + ldflags = `pkg-config --libs gz-utils2`.split system ENV.cxx, "test.cpp", *cflags, *ldflags,