update to work with sdf12 branch

Signed-off-by: Ashton Larkin <[email protected]>
gazebosim · Jan 24, 2022 · cea02cc · cea02cc
1 parent 3b292c6
commit cea02cc
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 331 deletions.
diff --git a/usd/include/sdf/usd/World.hh b/usd/include/sdf/usd/World.hh
diff --git a/usd/include/sdf/usd/Light.hh → usd/include/sdf/usd/sdf_parser/Light.hh b/usd/include/sdf/usd/Light.hh → usd/include/sdf/usd/sdf_parser/Light.hh
@@ -15,11 +15,15 @@
  *
 */
 
-#ifndef SDF_USD_LIGHT_HH_
-#define SDF_USD_LIGHT_HH_
+#ifndef SDF_USD_SDF_PARSER_LIGHT_HH_
+#define SDF_USD_SDF_PARSER_LIGHT_HH_
 
 #include <string>
 
+// TODO(adlarkin):this is to remove deprecated "warnings" in usd, these warnings
+// are reported using #pragma message so normal diagnostic flags cannot remove
+// them. This workaround requires this block to be used whenever usd is
+// included.
 #pragma push_macro ("__DEPRECATED")
 #undef __DEPRECATED
 #include <pxr/usd/usd/stage.h>

diff --git a/usd/include/sdf/usd/Utils.hh → usd/include/sdf/usd/sdf_parser/Utils.hh b/usd/include/sdf/usd/Utils.hh → usd/include/sdf/usd/sdf_parser/Utils.hh
@@ -15,19 +15,24 @@
  *
 */
 
-#ifndef SDF_USD_UTILS_HH_
-#define SDF_USD_UTILS_HH_
+#ifndef SDF_USD_SDF_PARSER_UTILS_HH_
+#define SDF_USD_SDF_PARSER_UTILS_HH_
 
 #include <ignition/math/Angle.hh>
 #include <ignition/math/Pose3.hh>
 #include <ignition/math/Vector3.hh>
 #include <ignition/math/Quaternion.hh>
-#include <pxr/base/gf/vec3d.h>
+
+// TODO(adlarkin):this is to remove deprecated "warnings" in usd, these warnings
+// are reported using #pragma message so normal diagnostic flags cannot remove
+// them. This workaround requires this block to be used whenever usd is
+// included.
 #pragma push_macro ("__DEPRECATED")
 #undef __DEPRECATED
+#include <pxr/base/gf/vec3d.h>
 #include <pxr/usd/usd/stage.h>
-#pragma pop_macro ("__DEPRECATED")
 #include <pxr/usd/usdGeom/xformCommonAPI.h>
+#pragma pop_macro ("__DEPRECATED")
 
 #include "sdf/SemanticPose.hh"
 #include "sdf/config.hh"

diff --git a/usd/src/CMakeLists.txt b/usd/src/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(sources
+  sdf_parser/Light.cc
   sdf_parser/World.cc
 )
 
@@ -17,6 +18,7 @@ target_link_libraries(${usd_target}
 
 set(gtest_sources
   sdf_parser/sdf2usd_TEST.cc
+  sdf_parser/Light_Sdf2Usd_TEST.cc
   sdf_parser/World_Sdf2Usd_TEST.cc
 )
 
@@ -25,9 +27,7 @@ ign_build_tests(
   TYPE UNIT
   SOURCES ${gtest_sources}
   LIB_DEPS ${usd_target} ignition-cmake${IGN_CMAKE_VER}::utilities
-  INCLUDE_DIRS
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/test
+  INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/test
 )
 
 add_subdirectory(cmd)
diff --git a/usd/src/World.cc b/usd/src/World.cc
diff --git a/usd/src/World_Sdf2Usd_TEST.cc b/usd/src/World_Sdf2Usd_TEST.cc
diff --git a/usd/src/sdf2usd_TEST.cc b/usd/src/sdf2usd_TEST.cc