Fixes from code review from Sean.

Autodesk · Jan 26, 2024 · 7a7afb1 · 7a7afb1
1 parent 27b9a7a
commit 7a7afb1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 35 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -127,7 +127,7 @@ else()
     message(STATUS "UFE not found.")
 endif()
 
-find_package(MayaUsd OPTIONAL_COMPONENTS)
+find_package(MayaUsd)
 if(MayaUsd_FOUND)
     message(STATUS "Building with MayaUsd.")
 else()

diff --git a/cmake/modules/FindMayaUsd.cmake b/cmake/modules/FindMayaUsd.cmake
@@ -5,8 +5,7 @@
 # It searches for MayaUsd's libraries and include header files.
 #
 # Variables that will be defined:
-# MAYAUSD_FOUND           Defined if a MayaUsd installation has been detected
-# MAYAUSD_LIBRARY_DIR     Path to MayaUsd libraries directory
+# MayaUsd_FOUND           Defined if a MayaUsd installation has been detected
 # MAYAUSD_INCLUDE_DIR     Path to the MayaUsd include directory
 # MAYAUSDAPI_LIBRARY      Path to MayaUsdAPI library
 # MAYAUSD_MOD_PATH        Path to mayaUSD.mod file
@@ -22,23 +21,11 @@ find_path(MAYAUSD_INCLUDE_DIR
         "MayaUsd header path"
 )
 
-find_path(MAYAUSD_LIBRARY_DIR
-        mayaUsd.lib
-    HINTS
-        ${MAYAUSD_LOCATION}
-    PATH_SUFFIXES
-        lib/
-    DOC
-        "MayaUsd libraries path"
-)
-
 find_library(MAYAUSDAPI_LIBRARY
     NAMES
         mayaUsdAPI
     HINTS
         ${MAYAUSD_LOCATION}
-    PATHS
-        ${MAYAUSD_LIBRARY_DIR}
     PATH_SUFFIXES
         lib/
     DOC
@@ -62,26 +49,14 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(MAYAUSD
     REQUIRED_VARS
         MAYAUSD_INCLUDE_DIR
-        MAYAUSD_LIBRARY_DIR
+        MAYAUSDAPI_LIBRARY
 )
 
 if(MAYAUSD_FOUND)
     message(STATUS "MayaUsd found : ${MAYAUSD_LOCATION}")
     message(STATUS "MayaUsd include dir: ${MAYAUSD_INCLUDE_DIR}")
-    message(STATUS "MayaUsd libraries dir: ${MAYAUSD_LIBRARY_DIR}")
-    message(STATUS "MayaUsdAPI.lib fullpath : ${MAYAUSDAPI_LIBRARY}")
+    message(STATUS "MayaUsdAPI library fullpath : ${MAYAUSDAPI_LIBRARY}")
     message(STATUS "MAYAUSD_MOD_PATH : ${MAYAUSD_MOD_PATH}")
-
-    #Add MAYAUSD_MOD_PATH (the path where maya USD .mod file is) to the MAYA_MODULE_PATH
-
-    # Get the current value of the environment variable
-    set(CURRENT_MAYA_MODULE_PATH $ENV{MAYA_MODULE_PATH})
-
-    # Append the new path to the current value
-    set(MAYA_MODULE_PATH "${CURRENT_MAYA_MODULE_PATH}:${MAYAUSD_MOD_PATH}")
-
-    # Export the new value to the environment
-    set(ENV{MAYA_MODULE_PATH} ${MAYA_MODULE_PATH})
 else()
     if(DEFINED MAYAUSD_LOCATION)
         message(WARNING "Could not find MayaUsd library and include directories in the folder provided : ${MAYAUSD_LOCATION}")

diff --git a/cmake/test.cmake b/cmake/test.cmake
@@ -1,5 +1,15 @@
 set(MAYA_USD_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
+if(MAYAUSD_FOUND)
+    #Add MAYAUSD_MOD_PATH (the path where maya USD .mod file is) to the MAYA_MODULE_PATH
+    # Get the current value of the environment variable
+    set(CURRENT_MAYA_MODULE_PATH $ENV{MAYA_MODULE_PATH})
+    # Append the new path to the current value
+    set(MAYA_MODULE_PATH "${CURRENT_MAYA_MODULE_PATH}:${MAYAUSD_MOD_PATH}")
+    # Export the new value to the environment
+    set(ENV{MAYA_MODULE_PATH} ${MAYA_MODULE_PATH})
+endif()
+
 function(mayaUsd_get_unittest_target unittest_target unittest_basename)
     get_filename_component(unittest_name ${unittest_basename} NAME_WE)
     set(${unittest_target} "${unittest_name}" PARENT_SCOPE)

diff --git a/lib/mayaHydra/hydraExtensions/CMakeLists.txt b/lib/mayaHydra/hydraExtensions/CMakeLists.txt
@@ -33,7 +33,7 @@ set(HEADERS
 target_compile_definitions(${TARGET_NAME} 
     PRIVATE 
         MAYAHYDRALIB_EXPORT
-        $<$<BOOL:${MAYAUSDAPI_LIBRARY}>:MAYAHYDRALIB_MAYAUSDAPI_ENABLED>
+        $<$<BOOL:${MayaUsd_FOUND}>:MAYAHYDRALIB_MAYAUSDAPI_ENABLED>
         $<$<BOOL:${IS_MACOSX}>:OSMac_>
         # Copy-pasted from lib/mayaUsd/CMakeLists.txt
 )
@@ -52,7 +52,7 @@ target_include_directories(${TARGET_NAME}
                 ${CMAKE_BINARY_DIR}/include
             PRIVATE
                 $<$<BOOL:${UFE_FOUND}>:${UFE_INCLUDE_DIR}>
-                $<$<BOOL:${MAYAUSDAPI_LIBRARY}>:${MAYAUSD_INCLUDE_DIR}>
+                $<$<BOOL:${MayaUsd_FOUND}>:${MAYAUSD_INCLUDE_DIR}>
 )
 
 target_compile_definitions(${TARGET_NAME}
@@ -123,7 +123,7 @@ target_link_libraries(${TARGET_NAME}
         $<$<BOOL:${USD_001905_BUILD}>:hio>
         ${PYTHON_LIBRARIES} 
         $<$<BOOL:${UFE_FOUND}>:${UFE_LIBRARY}>
-        $<$<BOOL:${MAYAUSDAPI_LIBRARY}>:${MAYAUSDAPI_LIBRARY}>
+        $<$<BOOL:${MayaUsd_FOUND}>:${MAYAUSDAPI_LIBRARY}>
 )
 
 # -----------------------------------------------------------------------------

diff --git a/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt b/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt
@@ -27,10 +27,10 @@ set(TEST_SCRIPT_FILES
     cpp/testFlowViewportAPIFilterPrims.py
 )
 
-#Add this test only if the MAYAUSDAPI_LIBRARY has been found during compile time.
-if(MAYAUSDAPI_LIBRARY)
+#Add this test only if the MayaUsd_FOUND (so also MAYAUSDAPI_LIBRARY) has been found during compile time.
+if(MayaUsd_FOUND)
     list(APPEND TEST_SCRIPT_FILES testMayaUsdAPIUsage.py)
-endif(MAYAUSDAPI_LIBRARY)
+endif(MayaUsd_FOUND)
 
 # Test use of mesh adapter code for mesh support, using environment variable.
 # As of 13-Jun-2023, if a test in this list is identical to a test in