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.

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

ignition-utils2: Rename CMake project to gz-utils2 #1932

Merged
merged 3 commits into from
Jun 24, 2022
Merged
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions Formula/ignition-utils2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,14 +23,14 @@ def install

test do
(testpath/"test.cpp").write <<-EOS
#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>
class SomeClassPrivate
{
};
class SomeClass
{
private: ignition::utils::ImplPtr<SomeClassPrivate> dataPtr =
ignition::utils::MakeImpl<SomeClassPrivate>();
private: gz::utils::ImplPtr<SomeClassPrivate> dataPtr =
gz::utils::MakeImpl<SomeClassPrivate>();
};
int main() {
SomeClass object;
Expand All @@ -39,13 +39,13 @@ 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})
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,
Expand Down