Commit Graph

28 Commits

Author SHA1 Message Date
Alex Neundorf
ce28737c93 Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017
This puts the new search behaviour for included files in action, i.e.
now when a file from Modules/ include()s another file, it also gets the
one from Modules/ included, i.e. the one it expects.

Alex
2011-01-04 08:20:08 -05:00
David Cole
b0fb2ad3e1 Merge topic 'AddCMAKE_CURRENT_LIST_DIR'
b011840 Use absolute path to FindPackageHandleStandardArgs.cmake everywhere
41e4f1a Add automatic variable CMAKE_CURRENT_LIST_DIR(dir of CMAKE_CURRENT_LIST_FILE)
f9fc79c Remove trailing whitespace
2010-10-19 15:53:16 -04:00
Brad King
ba3064b584 Merge topic 'FindCUDA-allow-g3'
6916f8d Allow -g3 for CUDA v3.0+.
2010-10-05 15:33:12 -04:00
James Bigler
6916f8dba7 Allow -g3 for CUDA v3.0+.
In versions of the CUDA toolkit previous to version 3.0 the use of -g3 would cause
compilation errors.  This was fixed in version 3.0.
2010-10-04 16:42:21 -06:00
James Bigler
1df8516c0e Fix for bug 0011263.
Added CUSDKCOMPUTE_ROOT to the list of paths when looking for CUDA_SDK_ROOT_DIR.
2010-10-04 16:11:08 -06:00
Alex Neundorf
b01184022b Use absolute path to FindPackageHandleStandardArgs.cmake everywhere
This is to avoid getting an (older) copy of FPHSA.cmake which is
e.g. installed with KDE 4.5.0 and 4.5.1.

Alex
2010-09-28 22:30:31 +02:00
James Bigler
4f0636e979 Added CUDA 3.2 directory changes. Disable emulation mode for CUDA 3.1+.
CUDA 3.2 on Windows systems changed the layout of the library paths.  This adds the extra
directories needed to locate the new files.

I also explicitly disable emulation mode for CUDA 3.1+.  This feature was deprecated in
3.0 and ultimately removed in 3.1.  The script errors out if CUDA_BUILD_EMULATION is
turned on.  I didn't want to ignore emulation mode (even with a warning - which most
people may not even see) and have users confused as to why it wasn't working.
2010-09-10 11:48:38 -06:00
Alex Neundorf
656cd2fad2 Improved version checking for FindCUDA using the new mode of FPHSA
Alex
2010-08-07 23:09:14 +02:00
Kai Wasserbäch
9203e9187e Fix spelling errors reported by Lintian.
During a Lintian run on the binary packages of CMake in Debian I was
notified of many spelling mistakes.
2010-07-13 09:41:37 -04:00
Brad King
4ac531487b Merge branch 'CudaRTEmuLibraryForCUDA30' 2010-06-24 10:43:05 -04:00
James Bigler
bb6acb8667 Add support for the emulation version of the cudart library.
In version 3.0 of the CUDA toolkit when building code for emulation, you need to link
against a new version of the cuda run time library called cudartemu.  This CL adds a check
for the new library and uses it when present and in emulation mode.  Note that this
library is not present in previous or subsequent versions of the CUDA toolkit.
2010-06-21 17:11:57 -06:00
James Bigler
1d5554201f CUDA_VERSION variable passed to REGEX needs quotes to work when not defined. 2010-06-15 10:03:40 -06:00
James Bigler
0d30e3fe91 Fixed: CUDA_VERSION_MAJOR/MINOR now computed after first run.
CUDA_VERSION_MAJOR and CUDA_VERSION_MINOR were only computed when CUDA_VERSION was first
computed.  Subsequent runs of FindCUDA would not have CUDA_VERSION_MAJOR/MINOR set.  We
now extract the major and minor versions from the CUDA_VERSION cache variable every run.
2010-05-12 16:38:51 -06:00
James Bigler
aa495ad021 Add -rpath for cuda libraries on Apple. They use @rpath in the library link names. 2010-01-28 13:50:38 -05:00
James Bigler
f04f912694 Updated the documentation on what kinds of flags you can use when setting target properties. 2010-01-28 13:08:56 -05:00
James Bigler
6faa4ae15e Changed warning string to use the WARNING flag. 2010-01-08 12:57:43 -05:00
James Bigler
d3034f9b56 Disable the --host-compilation flag for CUDA >= 3.0 since it is derecated. 2010-01-08 12:12:54 -05:00
James Bigler
bbfcb198f8 Fix #9970: Use execute_process instead of deprecated exec_program. 2009-12-01 16:28:26 -05:00
James Bigler
b1817590c1 Fix -fPIC from being used on executable object files.
BUILD_SHARED_LIBS is now only recognized when calling CUDA_ADD_LIBRARY.  If you want the CMAKE_SHARED_LIBRARY_C/CXX_FLAGS to be used, pass SHARED as an argument.  This prevents -fPIC from being used on objects destined for executables by default.
2009-11-04 01:15:31 -05:00
James Bigler
9605af8c2e Look for nvcc in the 32 bit bin directory before the 64 bin directory. 2009-10-27 12:00:28 -04:00
James Bigler
94fff7af35 Fix Xcode build.
Move the make_directory command to the main target, so that CMAKE_CFG_INTDIR
will get expanded by the build tool.
2009-10-06 22:52:52 -04:00
James Bigler
7112227c18 Updated copyright notice to conform to NVIDIA guidelines. 2009-10-05 17:14:33 -04:00
James Bigler
c66fb80171 Removed support for cutil library and header file.
Cutil was never intented to be used outside of the SDK.  The removal of this
code is in support of this.  The CUDA_SDK_ROOT_DIR will continue to be
supported, in case users wish to use this to find files in the SDK.  There are
also two examples of how to use CUDA_SDK_ROOT_DIR to find header files and
libraries if users so wish.
2009-09-28 23:41:40 -04:00
James Bigler
a26dac2202 Fixed CUDA_PROPAGATE_HOST_FLAGS, added path for Mac SDK.
The CUDA_PROPAGATE_HOST_FLAGS was incorrect in that it prevented the CUDA_NVCC_FLAGS_CONFIG variable from getting filled.

Also, added a search path for the CUDA SDK install on Macs.
2009-09-28 23:17:13 -04:00
Brad King
1a527daa3b Convert newlines from CRLF to LF
These files were committed to the repository with Windows newlines.
This converts them to Unix newlines so they will show up natively.
2009-09-25 15:42:53 -04:00
James Bigler
d468145fa2 Documentation fixes, new CUDA_PROPAGATE_HOST_FLAGS, changed output directory.
- Finished updating and formatting documentation.
- Added CUDA_PROPAGATE_HOST_FLAGS (Default ON) that can disable the C flag
propagation to the host compiler.
_ Changed the output directory for support files from
${CMAKE_CURRENT_BINARY_DIR} to ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles.  This
will hopefully reduce the clutter in the binary directory.
2009-09-25 00:28:12 -04:00
James Bigler
b7142e9214 Updated formatting of documentation plus a little reorganization. 2009-09-23 01:01:51 -04:00
James Bigler
eaaf71d7b3 Initial version of FindCUDA script. Still needs documentation formatting. 2009-09-15 02:38:20 -04:00