Merge pull request #787 from meshula/static_build

Fix pxrConfig.cmake (Internal change: 1948579)
PixarAnimationStudios · Mar 18, 2019 · ef688a0 · ef688a0
2 parents f398984 + 6b5e95e
commit ef688a0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 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
@@ -1296,21 +1296,24 @@ function(_pxr_library NAME)
  OPTIONAL
  )
  endif()
-
- export(TARGETS ${NAME}
- APPEND
- FILE "${PROJECT_BINARY_DIR}/pxrTargets.cmake"
- )
  else()
  install(
  TARGETS ${NAME}
+ EXPORT pxrTargets
  LIBRARY DESTINATION ${libInstallPrefix}
  ARCHIVE DESTINATION ${libInstallPrefix}
  RUNTIME DESTINATION ${libInstallPrefix}
  PUBLIC_HEADER DESTINATION ${headerInstallPrefix}
  )
  endif()
+
+ export(TARGETS ${NAME}
+ APPEND
+ FILE "${PROJECT_BINARY_DIR}/pxrTargets.cmake"
+ )
+
  endif()
+
  _install_resource_files(
  ${NAME}
  "${pluginInstallPrefix}"

diff --git a/pxr/CMakeLists.txt b/pxr/CMakeLists.txt
@@ -21,6 +21,6 @@ install(FILES
  DESTINATION "${CMAKE_INSTALL_PREFIX}"
 )
 
-if(BUILD_SHARED_LIBS AND NOT PXR_BUILD_MONOLITHIC)
- install(EXPORT pxrTargets DESTINATION "cmake")
+if (NOT PXR_BUILD_MONOLITHIC)
+ install(EXPORT pxrTargets DESTINATION "cmake")
 endif()
diff --git a/pxr/pxrConfig.cmake.in b/pxr/pxrConfig.cmake.in
@@ -3,6 +3,7 @@
 # PXR_INCLUDE_DIRS - Root include directory for the installed project.
 # PXR_LIBRARIES - List of all libraries, by target name.
 # PXR_foo_LIBRARY - Absolute path to individual libraries.
+# The preprocessor definition PXR_STATIC will be defined if appropriate
 
 set(PXR_CMAKE_DIR "@CMAKE_INSTALL_PREFIX@")
 include("${PXR_CMAKE_DIR}/cmake/pxrTargets.cmake")
@@ -15,3 +16,10 @@ foreach(lib ${libs})
  set(PXR_${lib}_LIBRARY ${location})
  list(APPEND PXR_LIBRARIES ${lib})
 endforeach()
+if(NOT @BUILD_SHARED_LIBS@)
+ if(WIN32)
+ list(APPEND PXR_LIBRARIES Shlwapi.lib)
+ list(APPEND PXR_LIBRARIES Dbghelp.lib)
+ endif()
+ add_definitions(-DPXR_STATIC)
+endif()