summaryrefslogtreecommitdiffstats
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.
* cmake: Teach "-E tar" command a "--format=" optionNils Gladitz2015-04-1018-56/+78
| | | | | | | Allows specifying a libarchive defined archive format currently restricted to 7zip, gnutar, pax, paxr and zip. The default is "paxr" (pax restricted).
* Merge topic 'FindCUDA.cmake/CUDA_SOURCE_FILE'Brad King2015-04-102-8/+23
|\ | | | | | | | | | | 1b0c77a3 FindCUDA: Add specific cuda_language_flag instead of using nvcc. 8313de2d FindCUDA: Allow setting CUDA_SOURCE_PROPERTY_FORMAT for non-.cu files.
| * 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 'fix-libarchive-mktemp'Brad King2015-04-101-3/+5
|\ \ | | | | | | | | | | | | 1f33b45d libarchive: Fix string concatentation in Windows mktemp implementation
| * | libarchive: Fix string concatentation in Windows mktemp implementationTim Kientzle2015-04-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port upstream LibArchive commit "compute string pointers after concatenation" (2014-09-25) and commit "Move variables to top of function for non-C99 compilers" (2014-11-15) to our CMake copy. Otherwise we may compute a pointer to memory that is about to be freed and then compute a bad size to give to CryptGenRandom. Inspired-by: Tim Kientzle <kientzle@gmail.com>
* | | Merge topic 'simplify-osx-install-prefix'Brad King2015-04-101-4/+1
|\ \ \ | | | | | | | | | | | | | | | | 73dcba51 Simplify logic to compute install prefix in OS X CMake.app
| * | | Simplify logic to compute install prefix in OS X CMake.appBrad King2015-04-091-4/+1
| | | | | | | | | | | | | | | | Also avoid explicitly dereferencing a variable in an if() condition.
* | | | CMake Nightly Date StampKitware Robot2015-04-101-1/+1
| | | |
* | | | Merge topic 'fix-libarchive-gnutar-large-ids'Brad King2015-04-091-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ad194ae0 libarchive: Use base-256 encoding for UID/GID like GNU tar does
| * | | | libarchive: Use base-256 encoding for UID/GID like GNU tar doesNils Gladitz2015-04-091-6/+6
| | |/ / | |/| |
* | | | Merge topic 'fix-liblzma-optimize'Brad King2015-04-092-3/+10
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | e5d336be liblzma: Disable GNU 3.3 compiler optimizations a2df4a3f liblzma: Disable XL compiler optimizations altogether
| * | | liblzma: Disable GNU 3.3 compiler optimizationsBrad King2015-04-081-0/+4
| | | | | | | | | | | | | | | | The GNU 3.3 optimizer causes bad behavior in liblzma, so disable it.
| * | | liblzma: Disable XL compiler optimizations altogetherBrad King2015-04-082-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 82c51a8a (liblzma: Disable XL compiler optimizations in one source to avoid crash, 2015-04-02) and instead add a compiler flag to disable optimizations in every source of liblzma. Somehow the XL compiler optimizations create incorrect behavior in liblzma and lead to crashes or truncated output during compression.
* | | | 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 'refactor-cache-api'Brad King2015-04-0929-312/+472
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba404938 cmCacheManager: Port consumers to non-iterator API. f3922a9a Port QtDialog to non-iterator cache API. 3e6a76e4 Port CursesDialog to non-iterator cache API. 9e641567 cmMakefile: Port away from CacheEntry.Initialized. 1e2dbfce cmCacheManager: Add non-iterator-based API. 60a62a91 cmCacheManager: Return a C string from GetValue. 77f2807c cmCacheManager: Rename GetCacheValue to GetInitializedCacheValue. 14973054 Add API for cache loading, deleting and saving to the cmake class. 1f2c12eb cmMakefile: Remove cache version accessors. 97c50a8d cmMakefile: Simplify GetDefinitions implementation.
| * | | | | cmCacheManager: Port consumers to non-iterator API.Stephen Kelly2015-04-0813-115/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies reasoning about the follow-up commit which ports away from cmCacheManager to a class with the same method names.
| * | | | | Port QtDialog to non-iterator cache API.Stephen Kelly2015-04-081-32/+40
| | | | | |
| * | | | | Port CursesDialog to non-iterator cache API.Stephen Kelly2015-04-083-76/+110
| | | | | |
| * | | | | cmMakefile: Port away from CacheEntry.Initialized.Stephen Kelly2015-04-081-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | The API has no other external users.
| * | | | | cmCacheManager: Add non-iterator-based API.Stephen Kelly2015-04-081-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iterator pattern is an unusual one for CMake, and it hinders refactoring all configuration-time data manipulation into a single class.
| * | | | | cmCacheManager: Return a C string from GetValue.Stephen Kelly2015-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for consistency with other CMake access interfaces such as definitions and properties which use a null value as a 'not present' value. It is source compatible with existing callers, and it returns a pointer into actual real cache entry storage.
| * | | | | cmCacheManager: Rename GetCacheValue to GetInitializedCacheValue.Stephen Kelly2015-04-078-37/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Being initialized is a requirement for this method to return something, and is what differentiates it from using GetIterator with it.GetValue.
| * | | | | Add API for cache loading, deleting and saving to the cmake class.Stephen Kelly2015-04-079-21/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate existing users of the CacheManager API to use the new API. The CacheManager will be going away soon.
| * | | | | cmMakefile: Remove cache version accessors.Stephen Kelly2015-04-074-22/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are only used by legacy code. Inline them there to simplify cmMakefile.
| * | | | | cmMakefile: Simplify GetDefinitions implementation.Stephen Kelly2015-04-071-6/+6
| | | | | |
* | | | | | Merge topic 'cmake-command-line-help-vs-arch'Brad King2015-04-098-21/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e384337 cmake: Show in --help how to select VS target platform (#15422)
| * | | | | | cmake: Show in --help how to select VS target platform (#15422)Brad King2015-04-078-21/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Re-order VS generators from newest to oldest. * Show how to specify a VS generator with a target platform * Increase the option output indentation to avoid extra wrapping with longer generator names.
* | | | | | | Merge topic 'link-implicit-libs-full-path'Brad King2015-04-0930-8/+243
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 882f48e5 Link libraries by full path even in implicit directories 318cd370 Help: Add link target for Find Modules section of cmake-developer.7 1535dcd8 Tests: Teach RunCMake to optionally merge command output to stdout
| * | | | | | | Link libraries by full path even in implicit directoriesBrad King2015-04-0928-6/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CMP0003 was first introduced we wanted to link all libraries by full path. However, some projects had problems on platforms where find_library would find /usr/lib/libfoo.so when the project really wanted to link to /usr/lib/<arch>/libfoo.so and had been working by accident because pre-CMP0003 behavior used -lfoo to link. We first tried to address that in commit v2.6.0~440 (Teach find_library to avoid returning library paths in system directories, 2008-01-23) by returning just "foo" for libraries in implicit link directories. This caused problems for projects expecting find_library to always return a full path. We ended up using the solution in commit v2.6.0~366 (... switch library paths found in implicit link directories to use -l, 2008-01-31). However, the special case for libraries in implicit link directories has also proven problematic and confusing. Introduce policy CMP0060 to switch to linking all libraries by full path even if they are in implicit link directories. Explain in the policy documentation the factors that led to the original approach and now to this approach.
| * | | | | | | Help: Add link target for Find Modules section of cmake-developer.7Brad King2015-04-071-0/+1
| | | | | | | |
| * | | | | | | Tests: Teach RunCMake to optionally merge command output to stdoutBrad King2015-04-071-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests may need to read "cmake --build" output passed through from native build tools and do not know if it will be on stdout or stderr. Optionally use the same variable for the execute_process output so that it merges them and we can always match using expected stdout.
* | | | | | | | CMake Nightly Date StampKitware Robot2015-04-091-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | 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
| | | | | | | |
* | | | | | | | Merge topic 'emulator-property'Brad King2015-04-0820-4/+176
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1975d53a Help: Add notes for topic 'emulator-property' 9160d6c2 TestGenerator: Add CROSSCOMPILING_EMULATOR support. e942526b try_run: Use CMAKE_CROSSCOMPILING_EMULATOR. 579c4bec Properties: Add CROSSCOMPILING_EMULATOR target property.
| * | | | | | | | Help: Add notes for topic 'emulator-property'Brad King2015-04-081-0/+7
| | | | | | | | |
| * | | | | | | | TestGenerator: Add CROSSCOMPILING_EMULATOR support.Matt McCormick2015-04-086-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefix test commands with the CROSSCOMPILING_EMULATOR property for target executables. This allows test suites to be run on the host when crosscompiling.
| * | | | | | | | try_run: Use CMAKE_CROSSCOMPILING_EMULATOR.Matt McCormick2015-04-087-6/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the CMAKE_CROSSCOMPILING_EMULATOR variable is defined, and CMAKE_CROSSCOMPILING is TRUE, then use CMAKE_CROSSCOMPILING_EMULATOR to run the try_run executables. This prevents the need to populate TryRunResults.cmake when cross compiling.
| * | | | | | | | Properties: Add CROSSCOMPILING_EMULATOR target property.Matt McCormick2015-04-0711-0/+72
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CROSSCOMPILING_EMULATOR target property for executables. This is used by subsequent patches to run exectuables created for the target system when crosscompiling. The property is initialized by the CMAKE_CROSSCOMPILING_EMULATOR variable when defined.
* | | | | | | | Merge topic 'document_supported_compiler_feature_compilers'Brad King2015-04-0821-20/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 322cdc48 Help: Document supported compilers in cmake-compile-features.7
| * | | | | | | | Help: Document supported compilers in cmake-compile-features.7Robert Maynard2015-04-0721-20/+34
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend sentences in other documentation linking to this manual to say that it has a list of supported compilers. Co-Author: Brad King <brad.king@kitware.com>
* | | | | | | | Merge topic 'xcode-quote-path'Brad King2015-04-085-0/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dfd6f1f2 Xcode: Also quote strings containing // (#15487)
| * | | | | | | | Xcode: Also quote strings containing // (#15487)Gregor Jasny2015-04-045-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise those will be interpreted as start of a comment Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-04-081-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge topic 'refactor-cache-api'Brad King2015-04-0729-471/+311
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3347c5e4 Revert topic 'refactor-cache-api'
| * | | | | | | | Revert topic 'refactor-cache-api'Brad King2015-04-0729-471/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This topic was never tested without some follow-up commits. The GetCacheEntryValue API returns a pointer to memory freed on return. It will have to be revised along with the rest of the original topic.
* | | | | | | | | Merge topic 'refactor-cache-api'Brad King2015-04-0729-311/+471
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9410e24a cmCacheManager: Port consumers to non-iterator API. 7b7ae3b1 Port QtDialog to non-iterator cache API. 228c629c Port CursesDialog to non-iterator cache API. 2e50f5e7 cmMakefile: Port away from CacheEntry.Initialized. e6224367 cmCacheManager: Add non-iterator-based API. 9ada4c04 cmCacheManager: Rename GetCacheValue to GetInitializedCacheValue. 1fe7f24c Add API for cache loading, deleting and saving to the cmake class. 08c642c6 cmMakefile: Remove cache version accessors. cec8f97e cmMakefile: Simplify GetDefinitions implementation.