Port to OSX

shdwdln · Aug 22, 2016 · dc3851f · dc3851f
1 parent bf701e3
commit dc3851f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,16 +59,22 @@ ELSEIF ( BUILD_MTOA_TOOLS )
   INCLUDE_DIRECTORIES ( ${ARNOLD_INCLUDE_DIR} )
   INCLUDE_DIRECTORIES ( ${MTOA_INCLUDE_DIR} )
   SET ( MTOA_REQUIRED_LIBRARIES
-	${MtoA_mtoa_api_LIBRARY}
-	${Arnold_ai_LIBRARY}
-	${MAYA_OpenMayaAnim_LIBRARY}
-	${MAYA_OpenMayaRender_LIBRARY}
-	${MAYA_OpenMaya_LIBRARY}
-	${MAYA_Foundation_LIBRARY}
-	)
-
-  SET ( CMAKE_INSTALL_RPATH "${MAYA_LOCATION}/lib:${MAYA_LOCATION}/lib" )
-
+    ${MtoA_mtoa_api_LIBRARY}
+    ${Arnold_ai_LIBRARY}
+    ${MAYA_OpenMayaAnim_LIBRARY}
+    ${MAYA_OpenMayaRender_LIBRARY}
+    ${MAYA_OpenMaya_LIBRARY}
+    ${MAYA_Foundation_LIBRARY}
+    )
+  IF (APPLE)
+    SET ( CMAKE_SKIP_BUILD_RPATH  FALSE)
+    SET ( CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+    SET ( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+    SET ( CMAKE_INSTALL_RPATH "${ARNOLD_LOCATION}/bin:${MTOA_LOCATION}/bin" )
+    MESSAGE ( "CMAKE_INSTALL_RPATH ${ARNOLD_LOCATION}/bin:${MTOA_LOCATION}/bin" )
+  ELSE ()
+    SET ( CMAKE_INSTALL_RPATH "${MAYA_LOCATION}/lib:${MTOA_LOCATION}/lib" )
+  ENDIF()
   ADD_SUBDIRECTORY ( maya/mtoa )
 ELSEIF ( BUILD_3DFM_TOOLS )
 ENDIF()
diff --git a/maya/mtoa/translator/nCacheTranslator.h b/maya/mtoa/translator/nCacheTranslator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <translators/DagTranslator.h>
+// #include <translators/DagTranslator.h>
 #include <translators/shape/ShapeTranslator.h>
 #include <ai.h>