CR changes

Author: inwoods

Assets/Integrations/Autodesk/maya/scripts/unityOneClick/commands.py

@@ -269,8 +269,12 @@ def scriptCmd(cls):
 
     def doIt(self, args):
         def integrationBinPath():
+            # e.g. /Users/inwoods/Development/MyGame/Assets/Integrations/Autodesk/maya/plug-ins/unityOneClickPlugin.py
+            # returns /Users/inwoods/Development/MyGame/Assets/Integrations
             head, tail = os.path.split(maya.cmds.pluginInfo("unityOneClickPlugin", q=True, path=True))
             head, tail = os.path.split(head)
+            head, tail = os.path.split(head)
+            head, tail = os.path.split(head)
             return head
 
         unityAppPath = maya.cmds.optionVar(q='UnityApp')

CMakeLists.txt

@@ -46,7 +46,12 @@ if (NOT DEFINED FBXSDK_PACKAGE_PATH)
         set(FBXSDK_PACKAGE_PATH ${NEWEST_PACKAGE})
     endif()
 endif()
-message(STATUS "Using FbxSdk Package: ${FBXSDK_PACKAGE_PATH}")
+
+IF(EXISTS ${FBXSDK_PACKAGE_PATH})
+    message(STATUS "Using FbxSdk Package: ${FBXSDK_PACKAGE_PATH}")
+ELSE()
+    message(FATAL_ERROR "Cannot find FbxSdk Package: ${FBXSDK_PACKAGE_PATH}")
+ENDIF()
 
 # promote warnings to errors
 if(MSVC)
@@ -70,21 +75,15 @@ set(Python_ADDITIONAL_VERSIONS 2.7)
 ###########################################################################
 # Import FbxSharp package
 
-# remove FbxSdk folder
-file(REMOVE_RECURSE "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxSdk")
-
 set(FBXSDK_PACKAGE_TARGET import_fbxsdk)
 add_custom_target(
     ${FBXSDK_PACKAGE_TARGET}
+    # remove FbxSdk folder
+    COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxSdk"
     COMMAND "${UNITY_EDITOR_PATH}" -projectPath "${CMAKE_SOURCE_DIR}" -importPackage ${FBXSDK_PACKAGE_PATH} -quit
+    COMMAND ${CMAKE_COMMAND} -E rename "${CMAKE_SOURCE_DIR}/Assets/FbxSdk" "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxSdk"
 )
 
-IF(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/Assets/FbxSdk")
-    file(RENAME "${CMAKE_SOURCE_DIR}/Assets/FbxSdk" "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxSdk")
-ELSE()
-    message("Error failed to install FbxSdk")
-ENDIF()
-
 ###########################################################################
 # TODO: Add target to replace the version number in README.txt