summaryrefslogtreecommitdiffstats
path: root/Modules/FindCUDA.cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-doc-formatting' into doc-formattingBrad King2014-11-061-4/+4
|\ | | | | | | | | Resolve conflict in Modules/ExternalProject.cmake by keeping our side, which is more completely revised.
| * Modules: Wrap long lines in pre-formatted documentation blocksBrad King2014-11-061-4/+4
| | | | | | | | Help format the blocks better for display without a wide screen.
* | FindCUDA: Remove rpath logic outdated by CMake's own @rpath supportClinton Stimpson2014-10-221-12/+0
|/ | | | | Otherwise binaries end up with two copies of the same value and the OS X install_name_tool may corrupt them.
* FindCUDA: Avoid if() auto-dereference in string comparisonsAdam Strzelecki2014-09-241-7/+7
| | | | This silences possible CMP0054 warnings.
* FindCUDA: Fix OSX Clang & no C language enabledAdam Strzelecki2014-06-301-2/+12
| | | | | | | | | | | When setting default CUDA_HOST_COMPILER we must dereference CMAKE_C_COMPILER, i.e. /usr/bin/clang should be used instead /usr/bin/cc which is symlink. Otherwise CUDA thinks it is GCC and issues -dumpspecs which is unknown option to Clang. Also in case neither CMAKE_C_COMPILER is defined (project does not use C language) nor CUDA_HOST_COMPILER is specified manually we should skip -ccbin and let nvcc use its own default C compiler.
* Do not change minimum required version in modulesDaniele E. Domenichelli2014-05-191-5/+0
| | | | | | | | | | | | | | | | | | | | Some modules change CMake minimum required version when they are included. For example: cmake_minimum_required(VERSION 2.8.12) message("${CMAKE_MINIMUM_REQUIRED_VERSION}") include(CheckTypeSize) message("${CMAKE_MINIMUM_REQUIRED_VERSION}") will produce the following output: 2.8.12 2.6 This patch ensures that when you include a CMake module the minimum required version and the policies set are left unchanged. Fixes Issue #14864
* Merge topic 'FindCUDA-separable-compilation-flags'Brad King2014-05-191-0/+9
|\ | | | | | | | | 6ad14c71 FindCUDA: Use CUDA_NVCC_FLAGS* for separable compilation
| * FindCUDA: Use CUDA_NVCC_FLAGS* for separable compilationJames Bigler2014-05-191-0/+9
| | | | | | | | | | | | | | Previously when linking the intermediate link file for separable compilation the CUDA_NVCC_FLAGS* were not used. This caused tremendous confusion when using this feature, and I consider it to be a bug. This change should fix this.
* | FindCUDA: Add support for compilation to fatbin & cubin modulesTobias Zirr2014-04-301-29/+60
| |
* | Remove .* expressions from beginning and end of MATCHES regexsRolf Eike Beer2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | All these expressions work the same: "foo" ".*foo.*" "^.*foo.*$" This assumes that the "Intel*" expressions were meant to be "Intel.*".
* | FindCUDA: Fix a typoBen Boeckel2014-03-081-1/+1
|/
* FindCUDA: Fix literal block formattingBrad King2014-01-291-161/+4
| | | | Fix locations of '::' manually to group literal blocks as desired.
* added support for arm cross compilation with CUDA 5.5:Vladislav Vinogradov2013-10-241-8/+40
| | | | | | | | | * added CUDA_TOOLKIT_TARGET_DIR CMake variable that used to locate headers and libraries for target platform * added CUDA_TARGET_CPU_ARCH which is set to ARM for arm cross-compilation and is used to add --target-cpu-architecture NVCC flag
* Convert builtin help to reStructuredText source filesKitware Robot2013-10-151-281/+449
| | | | | | | | Run the convert-help.bash script to convert documentation: ./convert-help.bash "/path/to/CMake-build/bin" Then remove it.
* FindCUDA: Fix NPP library search for CUDA 5.5Vladislav Vinogradov2013-10-111-1/+16
| | | | In CUDA 5.5 NPP was divided onto 3 separate libraries: nppc, npps, nppi.
* FindCUDA: Always list custom command outputs in their targetsBrad King2013-09-131-16/+1
| | | | | | | | | CMake's intended interface for linking to explicit object files (marked with EXTERNAL_OBJECT) is that only those listed as target sources should be linked. Drop FindCUDA's attempt to hide the .obj files from VS IDE project files, which depends on VS-version-specific behavior of linking custom command outputs that happen to be named "*.obj". CMake puts external object files in a dedicated source group anyway.
* FindCUDA: Search for libraries in <prefix>/lib/<arch>/nvidida-current.Robert Maynard2013-07-221-1/+5
| | | | | | Ubuntu install the CUDA libraries into a location that is different than the default location provided by the NVidia installer. So we teach the FindCUDA package to also find the Ubuntu install location.
* Merge topic 'Cuda_WRAP_SRCS_duplicates'Brad King2013-05-161-0/+3
|\ | | | | | | | | 32b582d FindCUDA: Remove duplicate entries from INCLUDE_DIRECTORIES.
| * FindCUDA: Remove duplicate entries from INCLUDE_DIRECTORIES.Marcel Loose2013-04-181-0/+3
| | | | | | | | | | | | As of CMake 2.8.8, the INCLUDE_DIRECTORIES() command does not de-duplicate entries. Failure to do so can lead to an extremely long and repetitive list of -I entries on the command line.
* | FindCUDA: CUDA_COMPUTE_BUILD_PATH uses relative paths to binary dir.Mathias Gaunard2013-04-181-1/+7
|/ | | | | | | make CUDA_COMPUTE_BUILD_PATH use a relative path to the current binary directory instead of the current source directory if the source file considered is in the current binary directory. This is done to shorten the paths given to the compiler.
* Merge topic 'FindCUDA.cmake/SeparableCompilation'Brad King2013-03-181-13/+28
|\ | | | | | | | | b6e9b8f FindCUDA: Use the PRE_LINK mode only for MSVC >= 10
| * FindCUDA: Use the PRE_LINK mode only for MSVC >= 10James Bigler2013-03-141-13/+28
| | | | | | | | | | | | Use normal custom command dependencies by default. Use the PRE_LINK approach only to work around what seems to be a bug in msbuild handling of custom build rules that chain together.
* | Merge topic 'FindCUDA.cmake/AddCUDA_cupti_LIBRARY'Brad King2013-03-121-7/+26
|\ \ | | | | | | | | | | | | c939b49 FindCUDA: Added cupti library.
| * | FindCUDA: Added cupti library.James Bigler2013-03-121-7/+26
| | | | | | | | | | | | | | | | | | | | | In addition to adding the cupti library, find_local_library_first has been renamed to cuda_find_local_library_first with a backward compatibility macro to find_local_library_first. Also added cuda_find_local_library_first_with_path_ext to handle different paths.
* | | Merge topic 'FindCUDA.cmake/SeparableCompilation'Brad King2013-03-121-1/+150
|\ \ \ | | |/ | |/| | | | | | | 6a19150 FindCUDA: Add support for separable compilation
| * | FindCUDA: Add support for separable compilationJames Bigler2013-03-121-1/+150
| |/ | | | | | | | | | | | | | | | | | | | | | | This adds a new variable, CUDA_SEPARABLE_COMPILATION, and two new functions, CUDA_COMPUTE_SEPARABLE_COMPILATION_OBJECT_FILE_NAME and CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS. When CUDA_SEPARABLE_COMPILATION is specified then CUDA runtime objects will be compiled with the separable compilation flag. These object files are collected in a target named variable that can be used in CUDA_COMPUTE_SEPARABLE_COMPILATION_OBJECT_FILE_NAME and CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS.
* | FindCUDA: Remove linkage against CUDA driver library (#13084)James Bigler2013-03-121-5/+0
|/ | | | | The CUDA runtime library (libcudart) doesn't depend on the driver API library (libcuda) and shouldn't be used to link CUDA run time codes.
* Merge topic 'topics/FindCUDA/Add-CUDA_HOST_COMPILER'David Cole2012-09-181-5/+17
|\ | | | | | | | | db207e4 FindCUDA: Added CUDA_HOST_COMPILER variable.
| * FindCUDA: Added CUDA_HOST_COMPILER variable.James Bigler2012-08-201-5/+17
| | | | | | | | | | | | | | | | | | Added a new CUDA variable for specifying the CUDA_HOST_COMPILER. This will allow users to be able to specify which host compiler to use for invoking NVCC with. By default it will use the compiler used for host compilation. This is convenient for when you want to specify a different compiler than the default compiler. You end up using the same compiler for both the NVCC compilation and the host compilation instead of using the default compiler in the path for NVCC.
* | Merge topic 'topics/FindCUDA/Add-CUDA_SOURCE_PROPERTY_FORMAT'David Cole2012-08-241-19/+29
|\ \ | | | | | | | | | | | | 787287c Added CUDA_SOURCE_PROPERTY_FORMAT. Allows setting per file format (OBJ or PTX)
| * | Added CUDA_SOURCE_PROPERTY_FORMAT. Allows setting per file format (OBJ or PTX)James Bigler2012-08-201-19/+29
| | | | | | | | | | | | | | | Added CUDA_SOURCE_PROPERTY_FORMAT that allows users to set the format (OBJ or PTX) on a per file basis.
* | | Merge topic 'topics/FindCUDA/Fix-g3-again'David Cole2012-08-241-1/+11
|\ \ \ | |/ / |/| | | | | | | | a20c41d Replace -g3 with -g for CUDA 4.1 and 4.2 in addition to CUDA < 3.0.
| * | Replace -g3 with -g for CUDA 4.1 and 4.2 in addition to CUDA < 3.0.James Bigler2012-06-191-1/+11
| |/ | | | | | | | | CUDA 4.1 reintroduced the bug where -g3 breaks compilation. This wasn't fixed until CUDA 5.0, so both CUDA 4.1 and 4.2 have this bug.
* | use the find_* functions ENV parameterRolf Eike Beer2012-08-141-1/+3
| | | | | | | | | | | | | | | | | | Instead of directly passing $ENV{SOMEVAR} to a find_* call pass in ENV SOMEVAR. This will make sure the paths will get correctly handled through different platforms, especially on Windows. Also fixes one place where paths with windows delimiters (\) were hardcoded to use forward slashes.
* | Remove CMake-language block-end command argumentsKitware Robot2012-08-131-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ancient versions of CMake required else(), endif(), and similar block termination commands to have arguments matching the command starting the block. This is no longer the preferred style. Run the following shell code: for c in else endif endforeach endfunction endmacro endwhile; do echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/' done >convert.sed && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' | egrep -z -v '^(Utilities/cm|Source/kwsys/)' | egrep -z -v 'Tests/CMakeTests/While-Endwhile-' | xargs -0 sed -i -f convert.sed && rm convert.sed
* | Convert CMake-language commands to lower caseKitware Robot2012-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ancient CMake versions required upper-case commands. Later command names became case-insensitive. Now the preferred style is lower-case. Run the following shell code: cmake --help-command-list | grep -v "cmake version" | while read c; do echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g' done >convert.sed && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' | egrep -z -v '^(Utilities/cm|Source/kwsys/)' | xargs -0 sed -i -f convert.sed && rm convert.sed
* | fix some typosRolf Eike Beer2012-06-191-1/+1
|/
* fix the same typos as found by Debian in other places, tooRolf Eike Beer2012-02-181-1/+1
|
* Added support for curand, cusparse, npp, nvcuenc and nvcuvid libraries.James Bigler2011-12-201-1/+30
| | | | | | This addresses Bug 11882 which provided a sample implementation for adding support for cusparse. I went ahead and added all the libraries I thought appropriate.
* Merge topic 'topics/FindCUDA/Misc-fixes'David Cole2011-12-071-10/+11
|\ | | | | | | | | aa36082 Miscellaneous fixes.
| * Miscellaneous fixes.James Bigler2011-12-061-10/+11
| |
* | Merge topic 'topics/FindCUDA/Multi-dir-clash'David Cole2011-12-071-10/+54
|\ \ | | | | | | | | | | | | 80e279d Make CUDA working directory unique for each target.
| * | Make CUDA working directory unique for each target.James Bigler2011-12-061-10/+54
| |/ | | | | | | | | This allows you to have more than source file with the same name but different directories. The intermediate and configuration files are now in this same directory.
* | Merge topic 'topics/FindCUDA/Quote-fixes'David Cole2011-12-061-6/+6
|\ \ | | | | | | | | | | | | c3c7a0c Fixes for handling quotes in args and other places (Fix Bug 11726 and 12099).
| * | Fixes for handling quotes in args and other places (Fix Bug 11726 and 12099).James Bigler2011-12-061-6/+6
| |/
* | Merge topic 'topics/FindCUDA/linux-double-build'David Cole2011-12-061-0/+2
|\ \ | | | | | | | | | | | | aa59544 Reset dependency file list when a dependency disappeared.
| * | Reset dependency file list when a dependency disappeared.James Bigler2011-12-051-0/+2
| |/ | | | | | | | | | | Fix a long outstanding bug when a file in the dependency list wasn't found. This bug wouldn't reset the dependencies, so the makefile would still want the missing file when building. The work around was to configure twice, but this is no longer necessary.
* | Added support for CUDA_PATH which is present in the CUDA toolkit 3.2 onward.James Bigler2011-12-051-11/+14
|/ | | | | This required changing how the paths were used. I now use the PATH_SUFFIXES parameter instead of putting the whole path in the command.
* Modules: Include builtin FindPackageHandleStandardArgs directlyBrad King2011-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FindPackageHandleStandardArgs module was originally created outside of CMake. It was added for CMake 2.6.0 by commit e118a627 (add a macro FIND_PACKAGE_HANDLE_STANDARD_ARGS..., 2007-07-18). However, it also proliferated into a number of other projects that at the time required only CMake 2.4 and thus could not depend on CMake to provide the module. CMake's own find modules started using the module in commit b5f656e0 (use the new FIND_PACKAGE_HANDLE_STANDARD_ARGS in some of the FindXXX modules..., 2007-07-18). Then commit d358cf5c (add 2nd, more powerful mode to find_package_handle_standard_args, 2010-07-29) added a new feature to the interface of the module that was fully optional and backward compatible with all existing users of the module. Later commit 5f183caa (FindZLIB: use the FPHSA version mode, 2010-08-04) and others shortly thereafter started using the new interface in CMake's own find modules. This change was also backward compatible because it was only an implementation detail within each module. Unforutnately these changes introduced a problem for projects that still have an old copy of FindPackageHandleStandardArgs in CMAKE_MODULE_PATH. When any such project uses one of CMake's builtin find modules the line include(FindPackageHandleStandardArgs) loads the copy from the project which does not have the new interface! Then the including find module tries to use the new interface with the old module and fails. Whether this breakage can be considered a backward incompatible change in CMake is debatable. The situation is analagous to copying a standard library header from one version of a compiler into a project and then observing problems when the next version of the compiler reports errors in its other headers that depend on its new version of the original header. Nevertheless it is a change to CMake that causes problems for projects that worked with previous versions. This problem was discovered during the 2.8.3 release candidate cycle. It is an instance of a more general problem with projects that provide their own versions of CMake modules when other CMake modules depend on them. At the time we resolved this instance of the problem with commit b0118402 (Use absolute path to FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28) for the 2.8.3 release. In order to address the more general problem we introduced policy CMP0017 in commit db44848f (Prefer files from CMAKE_ROOT when including from CMAKE_ROOT, 2010-11-17). That change was followed by commit ce28737c (Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017, 2010-12-20) which reverted the original workaround in favor of using the policy. However, existing project releases do not set the policy behavior to NEW and therefore still exhibit the problem. We introduced in commit a364daf1 (Allow users to specify defaults for unset policies, 2011-01-03) an option for users to build existing projects by adding -DCMAKE_POLICY_DEFAULT_CMP0017=NEW to the command line. Unfortunately this solution still does not allow such projects to build out of the box, and there is no good way to suggest the use of the new option. The only remaining solution to keep existing projects that exhibit this problem building is to restore the change originally made in commit b0118402 (Use absolute path to FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28). This also avoids policy CMP0017 warnings for this particular instance of the problem the policy addresses.
* Remove usage of CMAKE_CURRENT_LIST_DIR now that we have CMP0017Alex Neundorf2011-01-041-1/+1
| | | | | | | | 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