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.

Sign up for GitHub

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

Use ign-utils instead of ign-cmake utilities #978

Merged
merged 4 commits into from
Apr 14, 2022
Merged

Use ign-utils instead of ign-cmake utilities #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c0d35a
Use ign-utils instead of ign-cmake utilities
chapulina Apr 14, 2022
556bd60
link to common
chapulina Apr 14, 2022
87d88f8
USD target
chapulina Apr 14, 2022
a571890
Merge branch 'sdf12' into chapulina/12/utilities
chapulina Apr 14, 2022
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
7 changes: 0 additions & 7 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,6 @@ if (BUILD_TESTING)
${PROJECT_SOURCE_DIR}/test
)

if (TARGET UNIT_ign_TEST)
# Link the libraries that we always need.
target_link_libraries("UNIT_ign_TEST"
ignition-cmake${IGN_CMAKE_VER}::utilities
)
endif()

if (TARGET UNIT_Converter_TEST)
target_link_libraries(UNIT_Converter_TEST
TINYXML2::TINYXML2)
Expand Down
2 changes: 1 addition & 1 deletion src/ign_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <stdlib.h>
#include <string>

#include <ignition/utilities/ExtraTestMacros.hh>
#include <ignition/utils/ExtraTestMacros.hh>

#include "sdf/parser.hh"
#include "sdf/SDFImpl.hh"
Expand Down
2 changes: 1 addition & 1 deletion usd/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ set(gtest_sources
ign_build_tests(
TYPE UNIT
SOURCES ${gtest_sources}
LIB_DEPS ${usd_target} ignition-cmake${IGN_CMAKE_VER}::utilities
LIB_DEPS ${usd_target}
INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/test usd_parser
)

Expand Down
2 changes: 1 addition & 1 deletion usd/src/sdf_parser/sdf2usd_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <ignition/common/Filesystem.hh>
#include <ignition/common/TempDirectory.hh>
#include <ignition/utilities/ExtraTestMacros.hh>
#include <ignition/utils/ExtraTestMacros.hh>

#include "test_config.h"
#include "test_utils.hh"
Expand Down
2 changes: 1 addition & 1 deletion usd/src/usd_parser/USDData_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <ignition/common/Filesystem.hh>
#include <ignition/common/Util.hh>

#include <ignition/utilities/ExtraTestMacros.hh>
#include <ignition/utils/ExtraTestMacros.hh>

#include <sdf/usd/usd_parser/USDData.hh>
#include <sdf/usd/UsdError.hh>
Expand Down
2 changes: 1 addition & 1 deletion usd/src/usd_parser/USDStage_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <ignition/common/Filesystem.hh>

#include <ignition/utilities/ExtraTestMacros.hh>
#include <ignition/utils/ExtraTestMacros.hh>

#include <sdf/usd/usd_parser/USDStage.hh>
#include <sdf/usd/UsdError.hh>
Expand Down
2 changes: 1 addition & 1 deletion usd/src/usd_parser/USDTransforms_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <gtest/gtest.h>

#include <ignition/utilities/ExtraTestMacros.hh>
#include <ignition/utils/ExtraTestMacros.hh>

#include "test_config.h"
#include "test_utils.hh"
Expand Down
2 changes: 1 addition & 1 deletion usd/src/usd_parser/usd2sdf_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <ignition/common/TempDirectory.hh>
#include <ignition/common/Util.hh>

#include <ignition/utilities/ExtraTestMacros.hh>
#include <ignition/utils/ExtraTestMacros.hh>

#include "sdf/Model.hh"
#include "sdf/Root.hh"
Expand Down