mirror of
https://github.com/PixarAnimationStudios/OpenSubdiv
synced 2024-09-19 22:30:05 +00:00
Fix FindMaya.cmake
- switch PATHS to HINTS to make sure that we pick up the correct location for various files & libs - fix the list append to dereference variables properly - minor code style cleanup fixes #266
This commit is contained in:
parent
37f25250f1
commit
6d367f7f13
@ -51,7 +51,9 @@
|
||||
# License text for the above reference.)
|
||||
|
||||
if(APPLE)
|
||||
find_path(MAYA_BASE_DIR ../../devkit/include/maya/MFn.h PATH
|
||||
find_path(MAYA_BASE_DIR
|
||||
../../devkit/include/maya/MFn.h
|
||||
HINTS
|
||||
${MAYA_LOCATION}
|
||||
$ENV{MAYA_LOCATION}
|
||||
"/Applications/Autodesk/maya2014/Maya.app/Contents"
|
||||
@ -63,7 +65,7 @@ if(APPLE)
|
||||
"/Applications/Autodesk/maya2010/Maya.app/Contents"
|
||||
)
|
||||
find_path(MAYA_LIBRARY_DIR libOpenMaya.dylib
|
||||
PATHS
|
||||
HINTS
|
||||
${MAYA_LOCATION}
|
||||
$ENV{MAYA_LOCATION}
|
||||
${MAYA_BASE_DIR}
|
||||
@ -75,7 +77,9 @@ if(APPLE)
|
||||
endif(APPLE)
|
||||
|
||||
if(UNIX)
|
||||
find_path(MAYA_BASE_DIR include/maya/MFn.h PATH
|
||||
find_path(MAYA_BASE_DIR
|
||||
include/maya/MFn.h
|
||||
HINTS
|
||||
${MAYA_LOCATION}
|
||||
$ENV{MAYA_LOCATION}
|
||||
"/usr/autodesk/maya2013-x64"
|
||||
@ -84,8 +88,9 @@ if(UNIX)
|
||||
"/usr/autodesk/maya2011-x64"
|
||||
"/usr/autodesk/maya2010-x64"
|
||||
)
|
||||
find_path(MAYA_LIBRARY_DIR libOpenMaya.so
|
||||
PATHS
|
||||
find_path(MAYA_LIBRARY_DIR
|
||||
libOpenMaya.so
|
||||
HINTS
|
||||
${MAYA_LOCATION}
|
||||
$ENV{MAYA_LOCATION}
|
||||
${MAYA_BASE_DIR}
|
||||
@ -97,8 +102,9 @@ if(UNIX)
|
||||
endif(UNIX)
|
||||
|
||||
if(WIN32)
|
||||
find_path(MAYA_BASE_DIR include/maya/MFn.h
|
||||
PATH
|
||||
find_path(MAYA_BASE_DIR
|
||||
include/maya/MFn.h
|
||||
HINTS
|
||||
${MAYA_LOCATION}
|
||||
$ENV{MAYA_LOCATION}
|
||||
"C:/Program Files/Autodesk/Maya2013.5-x64"
|
||||
@ -122,8 +128,9 @@ if(WIN32)
|
||||
"C:/Program Files (x86)/Autodesk/Maya2010"
|
||||
"C:/Autodesk/maya-2010x64"
|
||||
)
|
||||
find_path(MAYA_LIBRARY_DIR OpenMaya.lib
|
||||
PATHS
|
||||
find_path(MAYA_LIBRARY_DIR
|
||||
OpenMaya.lib
|
||||
HINTS
|
||||
${MAYA_LOCATION}
|
||||
$ENV{MAYA_LOCATION}
|
||||
${MAYA_BASE_DIR}
|
||||
@ -134,8 +141,9 @@ if(WIN32)
|
||||
)
|
||||
endif(WIN32)
|
||||
|
||||
find_path(MAYA_INCLUDE_DIR maya/MFn.h
|
||||
PATHS
|
||||
find_path(MAYA_INCLUDE_DIR
|
||||
maya/MFn.h
|
||||
HINTS
|
||||
${MAYA_LOCATION}
|
||||
$ENV{MAYA_LOCATION}
|
||||
${MAYA_BASE_DIR}
|
||||
@ -146,8 +154,9 @@ find_path(MAYA_INCLUDE_DIR maya/MFn.h
|
||||
"Maya's devkit headers path"
|
||||
)
|
||||
|
||||
find_path(MAYA_LIBRARY_DIR OpenMaya
|
||||
PATHS
|
||||
find_path(MAYA_LIBRARY_DIR
|
||||
OpenMaya
|
||||
HINTS
|
||||
${MAYA_LOCATION}
|
||||
$ENV{MAYA_LOCATION}
|
||||
${MAYA_BASE_DIR}
|
||||
@ -160,8 +169,9 @@ find_path(MAYA_LIBRARY_DIR OpenMaya
|
||||
|
||||
list(APPEND MAYA_INCLUDE_DIRS ${MAYA_INCLUDE_DIR})
|
||||
|
||||
find_path(MAYA_DEVKIT_INC_DIR GL/glext.h
|
||||
PATHS
|
||||
find_path(MAYA_DEVKIT_INC_DIR
|
||||
GL/glext.h
|
||||
HINTS
|
||||
${MAYA_LOCATION}
|
||||
$ENV{MAYA_LOCATION}
|
||||
${MAYA_BASE_DIR}
|
||||
@ -186,8 +196,9 @@ foreach(MAYA_LIB
|
||||
cg
|
||||
cgGL)
|
||||
|
||||
find_library(MAYA_${MAYA_LIB}_LIBRARY ${MAYA_LIB}
|
||||
PATHS
|
||||
find_library(MAYA_${MAYA_LIB}_LIBRARY
|
||||
${MAYA_LIB}
|
||||
HINTS
|
||||
${MAYA_LOCATION}
|
||||
$ENV{MAYA_LOCATION}
|
||||
${MAYA_BASE_DIR}
|
||||
@ -198,13 +209,15 @@ foreach(MAYA_LIB
|
||||
"Maya's ${MAYA_LIB} library path"
|
||||
)
|
||||
|
||||
|
||||
if (MAYA_${MAYA_LIB}_LIBRARY)
|
||||
list(APPEND ${MAYA_LIBRARIES} MAYA_${MAYA_LIB}_LIBRARY)
|
||||
list(APPEND MAYA_LIBRARIES ${MAYA_${MAYA_LIB}_LIBRARY})
|
||||
endif()
|
||||
endforeach(MAYA_LIB)
|
||||
|
||||
find_program(MAYA_EXECUTABLE maya
|
||||
PATHS
|
||||
find_program(MAYA_EXECUTABLE
|
||||
maya
|
||||
HINTS
|
||||
${MAYA_LOCATION}
|
||||
$ENV{MAYA_LOCATION}
|
||||
${MAYA_BASE_DIR}
|
||||
@ -228,9 +241,9 @@ include(FindPackageHandleStandardArgs)
|
||||
|
||||
find_package_handle_standard_args(Maya
|
||||
REQUIRED_VARS
|
||||
${MAYA_LIBRARIES}
|
||||
MAYA_EXECUTABLE
|
||||
MAYA_INCLUDE_DIRS
|
||||
MAYA_LIBRARIES
|
||||
VERSION_VAR
|
||||
MAYA_API_VERSION
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user