Merge pull request #32 from NathanaelAtEGR/fix/install-cmake-archive

* NathanaelAtEGR/fix/install-cmake-archive:
  [FIX] Perf issues and Windows build
  [FIX] Missing boost::boost, when configured without python
  Couldn't include Boost on macOS 13
  Add "ARCHIVE DEST..." to CMAKE Install for static libs and Windows DLL Loader

Author: davvid

CMakeLists.txt

@@ -40,6 +40,7 @@ if (MSVC)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:inline")
     endif()
 endif()
+add_compile_definitions("BOOST_NO_CXX98_FUNCTION_BASE")
 
 option(BUILD_TESTS "Build tests" ON)
 option(BUILD_DOCS "Build documentation" ON)
@@ -104,6 +105,11 @@ if(BUILD_PYTHON_BINDINGS)
         CACHE INTERNAL "Python library path.")
 endif()
 
+# usd::usd target always requres Boost::Boost
+if (NOT TARGET Boost::Boost)
+    find_package(Boost REQUIRED)
+endif()
+
 add_subdirectory(src)
 
 if (BUILD_TESTS)

src/CMakeLists.txt

@@ -49,6 +49,7 @@ endif()
 install(
     TARGETS unf
     EXPORT ${PROJECT_NAME}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )

src/unf/broker.cpp

@@ -43,6 +43,11 @@ BrokerPtr Broker::Create(const UsdStageWeakPtr& stage)
     return Registry[stage];
 }
 
+const UsdStageWeakPtr
+Broker::GetStage() const {
+    return _stage;
+}
+
 bool Broker::IsInTransaction() { return _mergers.size() > 0; }
 
 void Broker::BeginTransaction(CapturePredicate predicate)
@@ -170,14 +175,14 @@ void Broker::_NoticeMerger::Merge()
         // first notice, and all other can be pruned.
         if (notices.size() > 1 && notices[0]->IsMergeable()) {
             auto& notice = notices.at(0);
-            auto it = std::next(notices.begin());
 
-            while (it != notices.end()) {
+            auto it = std::next(notices.begin());
+            for (; it != notices.end(); ++it) {
                 // Attempt to merge content of notice with first notice
                 // if this is possible.
                 notice->Merge(std::move(**it));
-                it = notices.erase(it);
             }
+            notices.resize(1);
         }
     }
 }

src/unf/broker.h

@@ -61,7 +61,7 @@ class Broker : public PXR_NS::TfRefBase, public PXR_NS::TfWeakBase {
     UNF_API Broker& operator=(const Broker&) = delete;
 
     /// Return Usd Stage associated with the broker.
-    UNF_API const PXR_NS::UsdStageWeakPtr GetStage() const { return _stage; }
+    UNF_API const PXR_NS::UsdStageWeakPtr GetStage() const;
 
     /// \brief
     /// Indicate whether a notice transaction has been started.

src/unf/notice.cpp

@@ -63,13 +63,12 @@ ObjectsChanged& ObjectsChanged::operator=(const ObjectsChanged& other)
 
 void ObjectsChanged::Merge(ObjectsChanged&& notice)
 {
-    SdfPathSet resyncSet(_resyncChanges.begin(), _resyncChanges.end());
-
     // Update resyncChanges if necessary.
-    for (const auto& path : notice._resyncChanges) {
-        if (resyncSet.find(path) == resyncSet.end()) {
-            resyncSet.insert(path);
-            _resyncChanges.push_back(std::move(path));
+    for (auto& path : notice._resyncChanges) {
+        const auto iter = std::find(_resyncChanges.begin(), _resyncChanges.end(), path);
+        if (iter == _resyncChanges.end())
+        {
+            _resyncChanges.emplace_back(std::move(path));
         }
     }
 
@@ -78,31 +77,37 @@ void ObjectsChanged::Merge(ObjectsChanged&& notice)
         const SdfPath& primPath = path.GetPrimPath();
 
         // Skip if the path is already in resyncedPaths.
-        if (resyncSet.find(primPath) != resyncSet.end()) {
-            continue;
+        {
+            const auto it = std::find(
+                _resyncChanges.begin(), _resyncChanges.end(), primPath);
+            if (it != _resyncChanges.end())
+                continue;
         }
 
         // Skip if an ancestor of the path is already in resyncedPaths.
         bool ancestorResynced = false;
         for (const auto& ancestor : primPath.GetPrefixes()) {
-            if (resyncSet.find(ancestor) != resyncSet.end()) {
-                ancestorResynced = true;
-                break;
+            const auto it = std::find(
+                _resyncChanges.begin(), _resyncChanges.end(), ancestor);
+            if (it != _resyncChanges.end()) {
+                goto continue_ancestorResynced;
             }
         }
-        if (ancestorResynced) {
-            continue;
-        }
 
-        auto it = std::find(_infoChanges.begin(), _infoChanges.end(), path);
-        if (it == _infoChanges.end()) {
-            _infoChanges.push_back(std::move(path));
+        // Add infoChanges, when not already available
+        {
+            const auto it = std::find(
+                _infoChanges.begin(), _infoChanges.end(), path);
+            if (it == _infoChanges.end()) {
+                _infoChanges.push_back(std::move(path));
+            }
         }
+    continue_ancestorResynced:;
     }
 
     // Update changeFields.
     for (auto const& entry : notice._changedFields) {
-        auto const path = entry.first;
+        auto const& path = entry.first;
 
         if (_changedFields.find(path) == _changedFields.end()) {
             _changedFields[path] = std::move(notice._changedFields[path]);