Don't emit the configuration for a monolithic build

PixarAnimationStudios · Mar 9, 2019 · 6b5e95e · 6b5e95e
1 parent 046d0e6
commit 6b5e95e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/cmake/macros/Private.cmake b/cmake/macros/Private.cmake
@@ -1278,8 +1278,8 @@ function(_pxr_library NAME)
                 DESTINATION ${headerInstallPrefix}
             )
         endif()
-    else()
-        if(BUILD_SHARED_LIBS AND NOT PXR_BUILD_MONOLITHIC)
+    elseif(NOT PXR_BUILD_MONOLITHIC)
+        if(BUILD_SHARED_LIBS)
             install(
                 TARGETS ${NAME}
                 EXPORT pxrTargets

diff --git a/pxr/CMakeLists.txt b/pxr/CMakeLists.txt
@@ -21,4 +21,6 @@ install(FILES
   DESTINATION "${CMAKE_INSTALL_PREFIX}"
 )
 
-install(EXPORT pxrTargets DESTINATION "cmake")
+if (NOT PXR_BUILD_MONOLITHIC)
+    install(EXPORT pxrTargets DESTINATION "cmake")
+endif()