Minor osx fixes.

Remove FindCUDA and use cmake version instead.

src/CMakeLists.txt

@@ -12,36 +12,36 @@ SUBDIRS(bc6h)
 SUBDIRS(bc7)
 
 # OpenGL
-INCLUDE(FindOpenGL)
+#INCLUDE(FindOpenGL)
-IF(OPENGL_FOUND)
+#IF(OPENGL_FOUND)
-	MESSAGE(STATUS "Looking for OpenGL - found")
+#	MESSAGE(STATUS "Looking for OpenGL - found")
-ELSE(OPENGL_FOUND)
+#ELSE(OPENGL_FOUND)
-	MESSAGE(STATUS "Looking for OpenGL - not found")
+#	MESSAGE(STATUS "Looking for OpenGL - not found")
-ENDIF(OPENGL_FOUND)
+#ENDIF(OPENGL_FOUND)
 
 # GLUT
-INCLUDE(FindGLUT)
+#INCLUDE(FindGLUT)
-IF(GLUT_FOUND)
+#IF(GLUT_FOUND)
-	MESSAGE(STATUS "Looking for GLUT - found")
+#	MESSAGE(STATUS "Looking for GLUT - found")
-ELSE(GLUT_FOUND)
+#ELSE(GLUT_FOUND)
-	MESSAGE(STATUS "Looking for GLUT - not found")
+#	MESSAGE(STATUS "Looking for GLUT - not found")
-ENDIF(GLUT_FOUND)
+#ENDIF(GLUT_FOUND)
 
 # DirectX
-INCLUDE(${NV_CMAKE_DIR}/FindDirectX.cmake)
+#INCLUDE(${NV_CMAKE_DIR}/FindDirectX.cmake)
-IF(DX10_FOUND)
+#IF(DX10_FOUND)
-	MESSAGE(STATUS "Looking for DirectX - found")
+#	MESSAGE(STATUS "Looking for DirectX - found")
-ELSE(DX10_FOUND)
+#ELSE(DX10_FOUND)
-	MESSAGE(STATUS "Looking for DirectX - not found")
+#	MESSAGE(STATUS "Looking for DirectX - not found")
-ENDIF(DX10_FOUND)
+#ENDIF(DX10_FOUND)
 
 # GLEW
-INCLUDE(${NV_CMAKE_DIR}/FindGLEW.cmake)
+#INCLUDE(${NV_CMAKE_DIR}/FindGLEW.cmake)
-IF(GLEW_FOUND)
+#IF(GLEW_FOUND)
-	MESSAGE(STATUS "Looking for GLEW - found")
+#	MESSAGE(STATUS "Looking for GLEW - found")
-ELSE(GLEW_FOUND)
+#ELSE(GLEW_FOUND)
-	MESSAGE(STATUS "Looking for GLEW - not found")
+#	MESSAGE(STATUS "Looking for GLEW - not found")
-ENDIF(GLEW_FOUND)
+#ENDIF(GLEW_FOUND)
 
 # Cg
 #INCLUDE(${NV_CMAKE_DIR}/FindCg.cmake)
@@ -52,7 +52,7 @@ ENDIF(GLEW_FOUND)
 #ENDIF(CG_FOUND)
 
 # CUDA
-FIND_PACKAGE(CUDA)
+#FIND_PACKAGE(CUDA)
 IF(CUDA_FOUND)
     IF(MINGW)
         MESSAGE(STATUS "Looking for CUDA - not supported on MinGW")

src/nvcore/Debug.cpp

@@ -519,11 +519,7 @@ namespace
 #if defined(HAVE_EXECINFO_H)
 
     static bool hasStackTrace() {
-#if NV_OS_DARWIN
-        return backtrace != NULL;
-#else
         return true;
-#endif
     }