Merge branch 'sdf12' into ahcorde/usd_to_sdf_link_lights

adlarkin · web-flow · commit ab60b1a7eae9 · 2022-04-15T14:12:27.000-06:00
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -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)
diff --git a/src/ign_TEST.cc b/src/ign_TEST.cc
@@ -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"
diff --git a/usd/src/CMakeLists.txt b/usd/src/CMakeLists.txt
@@ -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
 )
 
diff --git a/usd/src/sdf_parser/sdf2usd_TEST.cc b/usd/src/sdf_parser/sdf2usd_TEST.cc
@@ -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"
diff --git a/usd/src/usd_parser/USDData_TEST.cc b/usd/src/usd_parser/USDData_TEST.cc
@@ -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>
diff --git a/usd/src/usd_parser/USDStage_TEST.cc b/usd/src/usd_parser/USDStage_TEST.cc
@@ -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>
diff --git a/usd/src/usd_parser/USDTransforms_TEST.cc b/usd/src/usd_parser/USDTransforms_TEST.cc
@@ -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"
diff --git a/usd/src/usd_parser/usd2sdf_TEST.cc b/usd/src/usd_parser/usd2sdf_TEST.cc
@@ -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/Light.hh"
 #include "sdf/Link.hh"

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ set(gtest_sources`
`68`	`68`	`ign_build_tests(`
`69`	`69`	`TYPE UNIT`
`70`	`70`	`SOURCES ${gtest_sources}`
`71`		`- LIB_DEPS ${usd_target} ignition-cmake${IGN_CMAKE_VER}::utilities`
	`71`	`+ LIB_DEPS ${usd_target}`
`72`	`72`	`INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/test usd_parser`
`73`	`73`	`)`
`74`	`74`