mirror of
https://github.com/PixarAnimationStudios/OpenSubdiv
synced 2024-11-24 12:30:17 +00:00
Fixed macOS static framework
Assigned the postfix "_static" to the static framework and also fixed header installation. This makes the static framework usable and also fixes build errors when using recent versions of CMake. Also fixes build errors that can occur when building with multiple threads.
This commit is contained in:
parent
62ddd17bcb
commit
bb0b366cb7
@ -287,7 +287,7 @@ if (NOT NO_LIB)
|
||||
FRAMEWORK true
|
||||
INSTALL_NAME_DIR "@rpath/OpenSubdiv.framework/OpenSubdiv"
|
||||
INSTALL_RPATH "@executable_path/Frameworks;@loader_path/Frameworks"
|
||||
OUTPUT_NAME OpenSubdiv
|
||||
OUTPUT_NAME OpenSubdiv_static
|
||||
CLEAN_DIRECT_OUTPUT true
|
||||
)
|
||||
|
||||
@ -301,6 +301,19 @@ if (NOT NO_LIB)
|
||||
PUBLIC_HEADER DESTINATION "${CMAKE_INCDIR_BASE}"
|
||||
ARCHIVE DESTINATION "${CMAKE_LIBDIR_BASE}")
|
||||
|
||||
foreach(file ${PUBLIC_HEADER_FILES})
|
||||
add_custom_command(TARGET osd_static_framework POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy
|
||||
"${CMAKE_SOURCE_DIR}/opensubdiv/${file}"
|
||||
"$<TARGET_FILE_DIR:osd_static_framework>/Headers/${file}"
|
||||
)
|
||||
endforeach(file)
|
||||
|
||||
add_custom_command(TARGET osd_static_framework POST_BUILD
|
||||
COMMAND ln -sf
|
||||
"Versions/Current/Headers"
|
||||
"$<TARGET_FILE_DIR:osd_static_framework>/../../Headers"
|
||||
)
|
||||
|
||||
#shared framework
|
||||
if (BUILD_SHARED_LIBS)
|
||||
|
Loading…
Reference in New Issue
Block a user