From 084c5d6c7e2cf89bb9a7a9a9d00e9ee4475e222f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Fri, 8 May 2020 16:17:08 +0200
Subject: IO: Move Abstract Hierarchy Iterator into `io/common`

The goal of the `AbstractHierarchyIterator` class (and supporting
classes) was to use it in different exporters. It shouldn't be part of
the USD module + namespace any more, now that it will also be used in
the upcoming Alembic exporter rewrite.

The source files are moved into `io/common`, which is compiled & linked
into a new library `bf_io_common`. The unittests are still inside the
`tests/gtests/usd` directory. They should be moved to a separate test
module too, but that will be delayed until after T73268 has been
resolved.

Reviewed By: mont29

Differential Revision: https://developer.blender.org/D7669
---
 tests/gtests/usd/CMakeLists.txt                      | 2 ++
 tests/gtests/usd/abstract_hierarchy_iterator_test.cc | 4 ++--
 tests/gtests/usd/hierarchy_context_order_test.cc     | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/gtests/usd/CMakeLists.txt b/tests/gtests/usd/CMakeLists.txt
index 56759f4ccea..d2bfe5e1306 100644
--- a/tests/gtests/usd/CMakeLists.txt
+++ b/tests/gtests/usd/CMakeLists.txt
@@ -35,6 +35,7 @@ set(INC
   ..
   ../../../source/blender/blenlib
   ../../../source/blender/blenkernel
+  ../../../source/blender/io/common
   ../../../source/blender/io/usd
   ../../../source/blender/makesdna
   ../../../source/blender/depsgraph
@@ -52,6 +53,7 @@ set(LIB
   bf_gpu
 
   bf_usd
+  bf_io_common
 
   ${BOOST_LIBRARIES}
   ${TBB_LIBRARIES}
diff --git a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
index 160dd52f39a..f2e8b09b8d3 100644
--- a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
+++ b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
@@ -16,8 +16,8 @@
  * The Original Code is Copyright (C) 2019 Blender Foundation.
  * All rights reserved.
  */
+#include "IO_abstract_hierarchy_iterator.h"
 #include "blenloader/blendfile_loading_base_test.h"
-#include "intern/abstract_hierarchy_iterator.h"
 
 extern "C" {
 #include "BLI_math.h"
@@ -32,7 +32,7 @@ extern "C" {
  * multiple times with different export paths, hence the set. */
 typedef std::map<std::string, std::set<std::string>> created_writers;
 
-using namespace USD;
+using namespace blender::io;
 
 class TestHierarchyWriter : public AbstractHierarchyWriter {
  public:
diff --git a/tests/gtests/usd/hierarchy_context_order_test.cc b/tests/gtests/usd/hierarchy_context_order_test.cc
index 4111fc7511e..25cda6d8670 100644
--- a/tests/gtests/usd/hierarchy_context_order_test.cc
+++ b/tests/gtests/usd/hierarchy_context_order_test.cc
@@ -16,7 +16,7 @@
  * The Original Code is Copyright (C) 2019 Blender Foundation.
  * All rights reserved.
  */
-#include "intern/abstract_hierarchy_iterator.h"
+#include "IO_abstract_hierarchy_iterator.h"
 
 #include "testing/testing.h"
 
@@ -24,7 +24,7 @@ extern "C" {
 #include "BLI_utildefines.h"
 }
 
-using namespace USD;
+using namespace blender::io;
 
 class HierarchyContextOrderTest : public testing::Test {
 };
-- 
cgit v1.2.3