mirror of
https://github.com/PixarAnimationStudios/OpenSubdiv
synced 2024-11-22 03:30:09 +00:00
Merge pull request #1238 from thomthom/dev-no-framework-option
Add option to not generate frameworks under macOS. Ref #1236
This commit is contained in:
commit
3daa08b1dd
@ -318,6 +318,7 @@ option(NO_GLTESTS "Disable GL tests")
|
|||||||
option(NO_GLEW "Disable use of GLEW" ON)
|
option(NO_GLEW "Disable use of GLEW" ON)
|
||||||
option(NO_GLFW "Disable components depending on GLFW" OFF)
|
option(NO_GLFW "Disable components depending on GLFW" OFF)
|
||||||
option(NO_GLFW_X11 "Disable GLFW components depending on X11" OFF)
|
option(NO_GLFW_X11 "Disable GLFW components depending on X11" OFF)
|
||||||
|
option(NO_MACOS_FRAMEWORK "Disable generation of framework on macOS" OFF)
|
||||||
|
|
||||||
option(OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES "Enable true derivative evaluation for Gregory basis patches" OFF)
|
option(OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES "Enable true derivative evaluation for Gregory basis patches" OFF)
|
||||||
|
|
||||||
|
@ -243,7 +243,7 @@ if (NOT NO_LIB)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Build frameworks ----------------------------------
|
# Build frameworks ----------------------------------
|
||||||
if(APPLE)
|
if(APPLE AND NOT NO_MACOS_FRAMEWORK)
|
||||||
get_directory_property(OSD_HEADER_FILES DIRECTORY ${PROJECT_SOURCE_DIR}/opensubdiv/osd DEFINITION PUBLIC_HEADER_FILES)
|
get_directory_property(OSD_HEADER_FILES DIRECTORY ${PROJECT_SOURCE_DIR}/opensubdiv/osd DEFINITION PUBLIC_HEADER_FILES)
|
||||||
get_directory_property(FAR_HEADER_FILES DIRECTORY ${PROJECT_SOURCE_DIR}/opensubdiv/far DEFINITION PUBLIC_HEADER_FILES)
|
get_directory_property(FAR_HEADER_FILES DIRECTORY ${PROJECT_SOURCE_DIR}/opensubdiv/far DEFINITION PUBLIC_HEADER_FILES)
|
||||||
get_directory_property(SDC_HEADER_FILES DIRECTORY ${PROJECT_SOURCE_DIR}/opensubdiv/sdc DEFINITION PUBLIC_HEADER_FILES)
|
get_directory_property(SDC_HEADER_FILES DIRECTORY ${PROJECT_SOURCE_DIR}/opensubdiv/sdc DEFINITION PUBLIC_HEADER_FILES)
|
||||||
|
Loading…
Reference in New Issue
Block a user