summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* CTestCoverageCollectGCOV: Write tar files intended for CDash in gnutar formatNils Gladitz2015-04-101-0/+1
| | | | | PHP's PharData can not currently (PHP 5.6.4) extract paxr tar archives with long filenames.
* FindCUDA: Add specific cuda_language_flag instead of using nvcc.James Bigler2015-04-092-1/+5
| | | | | | I was previously appending to nvcc_flags inside the file loop. This caused the flag to be appended multiple times which freaks out nvcc. Now the flag is specifically handled per file.
* FindCUDA: Allow setting CUDA_SOURCE_PROPERTY_FORMAT for non-.cu files.James Bigler2015-04-091-8/+19
| | | | | | | | | | | | A previously undocumented feature allowed overriding the format specified to CUDA_WRAP_SRCS with a source file property called CUDA_SOURCE_PROPERTY_FORMAT. I added documentation for this feature as well as added the ability to let nvcc compile any file regardless of type if this property was found. In addition, I also fixed a couple of bugs with the calls to _cuda_get_important_host_flags that weren't garding the arguments with "" to prevent empty values from causing errors.
* Merge topic 'FindCUDA.cmake/C++11Flags'Brad King2015-04-091-0/+13
|\ | | | | | | | | 99abebde FindCUDA: Handle c++11 host flag
| * FindCUDA: Handle c++11 host flagJames Bigler2015-04-081-0/+13
| | | | | | | | | | | | | | | | | | | | If the host flags contain a c++11 flag (at least for gcc), then we can't automatically propagate to nvcc it using -Xcompiler. This is because nvcc can't use any C++ only flags. Instead we find this flag and add it to nvcc's flags (it has a special flag for dealing with c++11 code) and remove it from the host flags. Co-Author: Guillermo Marcus <gmarcus@nvidia.com>
* | Merge topic 'FindMatlab_add_recent_versions'Brad King2015-04-081-0/+2
|\ \ | | | | | | | | | | | | 7e311773 FindMatlab: Look for R2014b and R2015a
| * | FindMatlab: Look for R2014b and R2015aDaniele E. Domenichelli2015-04-071-0/+2
| | |
* | | Features: VS 2013 Update 3 supports initializer lists (#15494)Brad King2015-04-061-6/+11
|/ / | | | | | | | | | | | | | | | | | | | | VS 2013 originally claimed to support initializer lists but a bug was found in which it generated bad code silently. For this reason we previously considered support to not be present. However, Update 3 adds a hard error on cases that previously generated bad code, so it is now safe to use initializer lists with VS 2013 Update 3 or greater. At worst a compiler error will be issued in the cases that do not work, but that is no different from any other compiler-specific workaround a project code may need.
* | Merge topic 'gcov-module-coverage-exclude'Brad King2015-04-061-1/+30
|\ \ | | | | | | | | | | | | 9a544f2d CTestCoverageCollectGCOV: Support CTEST_CUSTOM_COVERAGE_EXCLUDE
| * | CTestCoverageCollectGCOV: Support CTEST_CUSTOM_COVERAGE_EXCLUDENils Gladitz2015-04-041-1/+30
| | |
* | | FindCUDA: Use the static CUDA runtime library if available (#15482)James Bigler2015-04-031-4/+81
|/ / | | | | | | | | | | | | | | | | | | Beginning in CUDA 5.5 a static version of the cuda runtime library became available. Since nvcc defaults to using this library over the shared version, FindCUDA will also default to using this version. There are many advantages to using the static version (most importantly to avoid conflicts with multiple versions when building a CUDA based library). Offer a CUDA_USE_STATIC_CUDA_RUNTIME option to control this behavior.
* | Merge topic 'cpack-rpm-basic-symlink-handling'Brad King2015-03-311-21/+341
|\ \ | | | | | | | | | | | | | | | 68e13e98 Help: Add notes for topic 'cpack-rpm-basic-symlink-handling' 681f3a2f CPackRPM: Add basic symlink support (#15209)
| * | CPackRPM: Add basic symlink support (#15209)Domen Vrankar2015-03-311-21/+341
| | | | | | | | | | | | | | | | | | | | | RPM packages can contain symbolic links to relative paths - including support for multiple relocation paths through generation of post install relocation scripts. Add basic support with limitations described in documentation.
* | | UseSWIG: Do not use MAIN_DEPENDENCY on custom commands (#15480)Felix Schwitzer2015-03-301-2/+1
|/ / | | | | | | | | | | | | | | | | Add the dependency on the main swig input source file as a normal DEPENDS option. We cannot use MAIN_DEPENDENCY because if there are multiple target languages then multiple custom commands would want to use the same MAIN_DEPENDENCY, but at most one custom command may specify a given source file as its MAIN_DEPENDENCY. Exposed by a CMP0057 warning.
* | Merge topic 'ExternalData-recursive-match'Brad King2015-03-301-7/+28
|\ \ | | | | | | | | | | | | | | | 230f2d6e ExternalData: Add option to recursively match under directories 564c07f7 ExternalData: Parameterize internal file(GLOB) operation selection
| * | ExternalData: Add option to recursively match under directoriesBrad King2015-03-271-3/+20
| | | | | | | | | | | | | | | | | | Extend the ``DATA{Dir/,...}`` syntax with a new ``RECURSE:`` option to enable recursive matching of associated files. This will allow an entire directory tree of data to be referenced at once.
| * | ExternalData: Parameterize internal file(GLOB) operation selectionBrad King2015-03-271-6/+10
| | | | | | | | | | | | | | | | | | Extend the _ExternalData_arg_find_files signature with an option to specify the kind of file(GLOB) operation to be performed. Set CMP0009 to NEW so that GLOB_RECURSE does not follow symlinks.
* | | Xcode: Set ARCHS only when CMAKE_OSX_ARCHITECTURES is specified (#14736)Brad King2015-03-271-1/+0
| | | | | | | | | | | | | | | | | | Teach the Xcode generator that ONLY_ACTIVE_ARCH=YES means to use ARCHS, and that the default of ONLY_ACTIVE_ARCH=NO means to use NATIVE_ARCH and ignore ARCHS. In the latter case there is no reason to generate ARCHS.
* | | Merge topic 'fix-external-project-generator'Brad King2015-03-271-1/+4
|\ \ \ | | | | | | | | | | | | | | | | a704098d ExternalProject: fix the build command for generator overrides
| * | | ExternalProject: fix the build command for generator overridesBen Boeckel2015-03-261-1/+4
| |/ / | | | | | | | | | | | | | | | The `binary_dir` variable is never set, so this is invalid. Instead, use "." which all the other build commands use anyways. Also only set the --config option if it is meaningful.
* | | Merge topic 'FindMFC-CMP0054'Brad King2015-03-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | dcf29800 FindMFC: Use if(DEFINED) to simplify condition (#15477)
| * | | FindMFC: Use if(DEFINED) to simplify condition (#15477)Brad King2015-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Replace an old hack of the form 'if("${VAR}" MATCHES "^${VAR}$")' with the much simpler 'if(NOT DEFINED ${VAR})'. This was exposed by a CMP0054 warning.
| * | | Merge branch 'UseSWIG-fix-CMP0054-warnings' into releaseBrad King2015-03-091-4/+4
| |\ \ \
| * \ \ \ Merge branch 'cpack_rpm_mulit_prefix_fixup' into releaseBrad King2015-02-271-17/+25
| |\ \ \ \
* | | | | | GNU: Do not use -isystem with gfortranBrad King2015-03-261-0/+3
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler documents that USE statements search for ".mod" files in directories specified with -I, but not -isystem. Reported-by: Hugh Sorby <h.sorby@auckland.ac.nz>
* | | | | Merge topic 'SunPro-no-KPIE'Brad King2015-03-242-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 209c142f SunPro: Drop non-existent -KPIE flag
| * | | | | SunPro: Drop non-existent -KPIE flagSteven Vancoillie2015-03-232-2/+0
| | | | | |
* | | | | | Merge topic 'blugeneq-platform-files'Brad King2015-03-2415-0/+403
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13807bcb BlueGene/Q Platform files
| * | | | | | BlueGene/Q Platform filesTodd Gamblin2015-03-1915-0/+403
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | - based on the BlueGene/P platform files. - tested by Todd Gamblin (LLNL) and David DeMarle (Kitware)
* | | | | | OS X: Look for Xcode 5 platform-specific FrameworksGregor Jasny2015-03-241-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xcode 5 platform specific framework locations differ from the Xcode 6 ones. Look first for the Xcode 6 ones, then for iOS Xcode 5 ones and last for the Xcode 5 OS X ones. For reference, the XCTest.framework is located as follows: Xcode511.app/Contents/Developer/Library/Frameworks/XCTest.framework Xcode511.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/Developer/Library/Frameworks/XCTest.framework Xcode511.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator7.1.sdk/Developer/Library/Frameworks/XCTest.framework Xcode601.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework Xcode601.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework Xcode601.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks/XCTest.framework Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | Merge topic 'lib64_paths_crosscompiling'Brad King2015-03-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81bfebfe Linux: Ignore Debian-specific case when cross-compiling
| * | | | | | Linux: Ignore Debian-specific case when cross-compilingZack Galbreath2015-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When constructing settings for the target environment during cross compiling we should not check for /etc/debian_version on the host.
* | | | | | | Merge topic 'UseJava-fix-arg-parse'Brad King2015-03-231-11/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a21e8df0 UseJava: Fix add_jar argument parsing (#14655)
| * | | | | | | UseJava: Fix add_jar argument parsing (#14655)Mark Studenka2015-03-201-11/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.11~63^2 (UseJava.cmake: require explicit request to include jars, 2013-03-26) the argument parsing always overrides the variable settings even if the corresponding arguments are not passed. Re-order logic to fix this.
* | | | | | | Merge topic 'cpack-bundle-codesign'Brad King2015-03-231-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb3e4de8 CPack: Add support to overwrite or pass additional parameter to codesign
| * | | | | | | CPack: Add support to overwrite or pass additional parameter to codesignAndré Klitzing2015-03-231-0/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'cpack-rpm-ignore-default-prefix'Brad King2015-03-231-2/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18917d66 CPack/RPM ignore install prefix relocation path
| * | | | | | | CPack/RPM ignore install prefix relocation pathDomen Vrankar2015-03-201-2/+19
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch adds possibility to remove CPACK_PACKAGING_INSTALL_PREFIX from the list of relocation paths when crating a relocatable rpm.
* | | | | | | Merge topic 'SunPro-Fortran-KPIC'Brad King2015-03-231-0/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | 3556fb1b SunPro: Add position independent code flag for Fortran compiler
| * | | | | | SunPro: Add position independent code flag for Fortran compilerSteven Vancoillie2015-03-201-0/+1
| |/ / / / /
* | | | | | Merge topic 'pgi-no-pie'Brad King2015-03-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00842df4 PGI: Remove invalid -fPIE flag (#15460)
| * | | | | | PGI: Remove invalid -fPIE flag (#15460)Brad King2015-03-201-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PGI compilers on Linux do not have the -fPIE flag. Remove the table entry added by commit v2.8.9~125^2~2 (Add platform variables for position independent code flags, 2012-05-05), which likely included it only as part of a sweeping introduction of such flags.
* | | | | | Merge topic 'xcode-xctest'Brad King2015-03-231-0/+196
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4178cd88 Help: Add notes for topic 'xcode-xctest' 87a4b858 Tests: Add XCTest example to test Frameworks and Cocoa App Bundles ba14510b OS X: Add FindXCTest module 3714955b OS X: Add handling for XCTest bundles 54a5cdbb Tests: Compute Xcode version for any generator on OS X
| * | | | | OS X: Add FindXCTest moduleGregor Jasny2015-03-231-0/+196
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a module to lookup XCTest Framework and xctest utility. It also provides APIs for creating 'xctest' targets. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | Merge topic 'fix-FindPackageHandleStandardArgs-doc'Brad King2015-03-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 39451413 FPHSA: Revise documented command signature
| * | | | | FPHSA: Revise documented command signatureGregor Jasny2015-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For mode 2 the first argument is not the literal NAME but the package name. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | Merge topic 'cpack_rpm_component_fall_through'Brad King2015-03-201-652/+621
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be089724 CPack/RPM prevent component attributes leakage ffc1b945 CPack/RPM improved component override test
| * | | | | | CPack/RPM prevent component attributes leakageDomen Vrankar2015-03-171-652/+621
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes mantis bug report with id 15169. Some component specific attributes were leaking to next component. Leakage handling was implemented in different locations but there were still attributes that leaked. Patch encapsulates generator into function so all current leaks are fixed and no future leaks can occur.
* | | | | | Merge topic 'WCDH-fix-cxx_nullptr-workaround'Brad King2015-03-201-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9d09626 WCDH: Fix cxx_nullptr workaround for pre-C++11 compilers
| * | | | | | WCDH: Fix cxx_nullptr workaround for pre-C++11 compilersRoman Wüger2015-03-171-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Use just '0' instead of 'static_cast<void*>(0)' because the latter will not automatically convert to pointers to other types.