Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for Bug #472, nvcc fatal compute_11 unsupported workaround. Better cmake hints for Ubuntu #617

Closed
wants to merge 3 commits into from
Closed

Fix for Bug #472, nvcc fatal compute_11 unsupported workaround. Better cmake hints for Ubuntu #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13c89f8
Fixed CMake files with intel compiler default install path, captilzat…
Jun 9, 2015
16a79ab
Fixed the CLEW Cmake Find, incase of /lib/static.
Jun 9, 2015
c3c258d
Hotfix for bug #472, compute_11 not supported, changed for now to har…
Jun 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/FindCLEW.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ find_path(CLEW_INCLUDE_DIR
HINTS
${_clew_SEARCH_DIRS}
PATH_SUFFIXES
include
include include/CL
NO_DEFAULT_PATH
DOC "The directory where clew.h resides")

Expand All @@ -67,7 +67,7 @@ find_library(CLEW_LIBRARY
PATHS
${_clew_SEARCH_DIRS}
PATH_SUFFIXES
lib lib64
lib lib64 lib/static
NO_DEFAULT_PATH
DOC "The CLEW library")

Expand Down
4 changes: 2 additions & 2 deletions cmake/FindMaya.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ foreach(MAYA_LIB
Foundation
IMFbase
tbb
cg
cgGL)
Cg
CgGL)

find_library(MAYA_${MAYA_LIB}_LIBRARY
${MAYA_LIB}
Expand Down
2 changes: 2 additions & 0 deletions cmake/FindTBB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ else ()
"${TBB_LOCATION}/include"
"$ENV{TBB_LOCATION}/include"
PATHS
/opt/intel/tbb/include
/usr/include
/usr/local/include
/usr/openwin/share/include
Expand Down Expand Up @@ -118,6 +119,7 @@ foreach(TBB_LIB tbb tbb_debug
"$ENV{TBB_LOCATION}/lib"
"$ENV{TBB_LOCATION}/bin"
"$ENV{PROGRAMFILES}/TBB/lib"
/opt/intel/tbb/lib/
/usr/lib
/usr/lib/w32api
/usr/local/lib
Expand Down
2 changes: 1 addition & 1 deletion opensubdiv/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ if (NOT NO_LIB)
if( CUDA_FOUND )
include_directories( "${CUDA_INCLUDE_DIRS}" )
if (UNIX)
list( APPEND CUDA_NVCC_FLAGS -Xcompiler -fPIC --gpu-architecture compute_11 )
list( APPEND CUDA_NVCC_FLAGS -Xcompiler -fPIC --gpu-architecture compute_20 )
endif()
endif()

Expand Down