drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor osx fixes.

Browse Source 
Remove FindCUDA and use cmake version instead.
This commit is contained in:
Ignacio 2016-08-16 12:31:31 -07:00
parent 8659d3fb4a
commit b0afc82d7d
3 changed files with 25 additions and 1152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1123
cmake/FindCUDA.cmake
View File

File diff suppressed because it is too large Load Diff

50
src/CMakeLists.txt
View File

@ -12,36 +12,36 @@ SUBDIRS(bc6h)
SUBDIRS(bc7)
# OpenGL
INCLUDE(FindOpenGL)
IF(OPENGL_FOUND)
MESSAGE(STATUS "Looking for OpenGL - found")
ELSE(OPENGL_FOUND)
MESSAGE(STATUS "Looking for OpenGL - not found")
ENDIF(OPENGL_FOUND)
#INCLUDE(FindOpenGL)
#IF(OPENGL_FOUND)
# MESSAGE(STATUS "Looking for OpenGL - found")
#ELSE(OPENGL_FOUND)
# MESSAGE(STATUS "Looking for OpenGL - not found")
#ENDIF(OPENGL_FOUND)
# GLUT
INCLUDE(FindGLUT)
IF(GLUT_FOUND)
MESSAGE(STATUS "Looking for GLUT - found")
ELSE(GLUT_FOUND)
MESSAGE(STATUS "Looking for GLUT - not found")
ENDIF(GLUT_FOUND)
#INCLUDE(FindGLUT)
#IF(GLUT_FOUND)
# MESSAGE(STATUS "Looking for GLUT - found")
#ELSE(GLUT_FOUND)
# MESSAGE(STATUS "Looking for GLUT - not found")
#ENDIF(GLUT_FOUND)
# DirectX
INCLUDE(${NV_CMAKE_DIR}/FindDirectX.cmake)
IF(DX10_FOUND)
MESSAGE(STATUS "Looking for DirectX - found")
ELSE(DX10_FOUND)
MESSAGE(STATUS "Looking for DirectX - not found")
ENDIF(DX10_FOUND)
#INCLUDE(${NV_CMAKE_DIR}/FindDirectX.cmake)
#IF(DX10_FOUND)
# MESSAGE(STATUS "Looking for DirectX - found")
#ELSE(DX10_FOUND)
# MESSAGE(STATUS "Looking for DirectX - not found")
#ENDIF(DX10_FOUND)
# GLEW
INCLUDE(${NV_CMAKE_DIR}/FindGLEW.cmake)
IF(GLEW_FOUND)
MESSAGE(STATUS "Looking for GLEW - found")
ELSE(GLEW_FOUND)
MESSAGE(STATUS "Looking for GLEW - not found")
ENDIF(GLEW_FOUND)
#INCLUDE(${NV_CMAKE_DIR}/FindGLEW.cmake)
#IF(GLEW_FOUND)
# MESSAGE(STATUS "Looking for GLEW - found")
#ELSE(GLEW_FOUND)
# MESSAGE(STATUS "Looking for GLEW - not 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")

4
src/nvcore/Debug.cpp
View File

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