Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: export targets for usd_ms correctly #2026

Merged
merged 1 commit into from
Sep 20, 2022
Merged

fix: export targets for usd_ms correctly #2026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions cmake/macros/Public.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,7 @@ function(pxr_toplevel_prologue)
_get_install_dir("lib" libInstallPrefix)
install(
TARGETS usd_ms
EXPORT pxrTargets
LIBRARY DESTINATION ${libInstallPrefix}
ARCHIVE DESTINATION ${libInstallPrefix}
RUNTIME DESTINATION ${libInstallPrefix}
Expand Down Expand Up @@ -1041,20 +1042,21 @@ function(pxr_toplevel_epilogue)
# that we carefully avoid adding the usd_m target itself by using
# TARGET_FILE. Linking the usd_m target would link usd_m and
# everything it links to.

if(MSVC)
target_link_libraries(usd_ms
PRIVATE
-WHOLEARCHIVE:$<TARGET_FILE:usd_m>
-WHOLEARCHIVE:$<BUILD_INTERFACE:$<TARGET_FILE:usd_m>>
)
elseif(CMAKE_COMPILER_IS_GNUCXX)
target_link_libraries(usd_ms
PRIVATE
-Wl,--whole-archive $<TARGET_FILE:usd_m> -Wl,--no-whole-archive
-Wl,--whole-archive $<BUILD_INTERFACE:$<TARGET_FILE:usd_m>> -Wl,--no-whole-archive
)
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
target_link_libraries(usd_ms
PRIVATE
-Wl,-force_load $<TARGET_FILE:usd_m>
-Wl,-force_load $<BUILD_INTERFACE:$<TARGET_FILE:usd_m>>
)
endif()

Expand All @@ -1067,16 +1069,16 @@ function(pxr_toplevel_epilogue)
# usd_m target.
target_compile_definitions(usd_ms
PUBLIC
$<TARGET_PROPERTY:usd_m,INTERFACE_COMPILE_DEFINITIONS>
$<BUILD_INTERFACE:$<TARGET_PROPERTY:usd_m,INTERFACE_COMPILE_DEFINITIONS>>
)
target_include_directories(usd_ms
PUBLIC
$<TARGET_PROPERTY:usd_m,INTERFACE_INCLUDE_DIRECTORIES>
$<BUILD_INTERFACE:$<TARGET_PROPERTY:usd_m,INTERFACE_INCLUDE_DIRECTORIES>>
)
target_include_directories(usd_ms
SYSTEM
PUBLIC
$<TARGET_PROPERTY:usd_m,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
$<BUILD_INTERFACE:$<TARGET_PROPERTY:usd_m,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>>
)
foreach(lib ${PXR_OBJECT_LIBS})
get_property(libs TARGET ${lib} PROPERTY INTERFACE_LINK_LIBRARIES)
Expand Down
4 changes: 1 addition & 3 deletions pxr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,4 @@ install(FILES
DESTINATION "${CMAKE_INSTALL_PREFIX}"
)

if (NOT PXR_BUILD_MONOLITHIC)
install(EXPORT pxrTargets DESTINATION "cmake")
endif()
install(EXPORT pxrTargets DESTINATION "cmake")
6 changes: 5 additions & 1 deletion pxr/pxrConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ set(PXR_PATCH_VERSION "@PXR_PATCH_VERSION@")
set(PXR_VERSION "@PXR_VERSION@")

include("${PXR_CMAKE_DIR}/cmake/pxrTargets.cmake")
set(libs "@PXR_ALL_LIBS@")
if (TARGET usd_ms)
set(libs "usd_ms")
else()
set(libs "@PXR_ALL_LIBS@")
endif()
set(PXR_LIBRARIES "")
set(PXR_INCLUDE_DIRS "${PXR_CMAKE_DIR}/include")
string(REPLACE " " ";" libs "${libs}")
Expand Down