summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-G-print-generators'Brad King2015-04-137-4/+43
|\ | | | | | | | | 588dcb33 cmake: Provide guidance when an invalid -G option is given
| * cmake: Provide guidance when an invalid -G option is givenGerald Combs2015-04-107-4/+43
| | | | | | | | | | | | | | Print a list of generators if no generator or an invalid one is supplied. Signed-off-by: Gerald Combs <gerald@wireshark.org>
* | Merge topic 'move-command-line-tests'Brad King2015-04-1340-94/+108
|\ \ | |/ | | | | | | 4e039a9a Tests: Move more command line tests into RunCMake.CommandLine
| * Tests: Move more command line tests into RunCMake.CommandLineBrad King2015-04-1040-94/+108
| | | | | | | | | | | | Port most CMakeTestBadCommandLines test cases to RunCMake.CommandLine and drop the former test. Add validation of expected results, which was not done by the old test.
* | Merge topic 'c-locale-messages'Brad King2015-04-134-41/+103
|\ \ | | | | | | | | | | | | a198839a CTest: Fix locale used for VCS updates
| * | CTest: Fix locale used for VCS updatesNils Gladitz2015-04-134-41/+103
| | | | | | | | | | | | | | | | | | | | | | | | 6a661f06030b85b4484733375bbb0aa23eca7446 fixed the locale used for message output but at the same time broke the locale used for filename encodings. This commit preserves LC_CTYPE in the presence of LC_ALL.
* | | Merge topic 'emulator-property'Brad King2015-04-131-0/+8
|\ \ \ | | | | | | | | | | | | | | | | c9e9c31c Tests: Create pseudo_emulator output dir for Xcode 2.x
| * | | Tests: Create pseudo_emulator output dir for Xcode 2.xBrad King2015-04-101-0/+8
| | | | | | | | | | | | | | | | | | | | Apply the workardound from commit v2.8.2~598 (Create CMakeLibTests output dir for Xcode, 2009-12-09) to the pseudo_emulator tool.
* | | | Merge topic 'suppress-osx-arch-linker-warning'Brad King2015-04-131-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 1f3bb59b CTestCustom: Suppress more OS X universal binary link arch warnings fd5cbbe0 CTestCustom: Suppress more OS X universal binary link arch warnings
| * | | | CTestCustom: Suppress more OS X universal binary link arch warningsBrad King2015-04-101-0/+1
| | | | |
| * | | | CTestCustom: Suppress more OS X universal binary link arch warningsBrad King2015-04-091-0/+1
| | | | |
* | | | | Merge topic 'update-kwsys'Brad King2015-04-131-5/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5388583 Merge branch 'upstream-kwsys' into update-kwsys d34d5a37 KWSys 2015-04-10 (69bccf2e)
| * \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-04-131-5/+12
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | KWSys 2015-04-10 (69bccf2e)KWSys Robot2015-04-131-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 69bccf2e | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 9367a33b..69bccf2e Brad King (1): 69bccf2e SystemTools: Teach Touch with !create to succeed on missing file Change-Id: I4af502542578b6a16ca4ddffb03553a046378e56
* | | | | | CMake Nightly Date StampKitware Robot2015-04-131-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-04-121-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-04-111-1/+1
|/ / / / /
* | | | | Merge topic 'tar-write-format'Brad King2015-04-1057-143/+276
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c4781ba Tests: Consolidate, refactor and extend -E tar tests fd04d873 CTestCoverageCollectGCOV: Write tar files intended for CDash in gnutar format d2cc5807 cmake: Teach "-E tar" command a "--format=" option
| * | | | | Tests: Consolidate, refactor and extend -E tar testsNils Gladitz2015-04-1041-88/+198
| | | | | |
| * | | | | 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
generated by cgit v0.12 at 2025-09-09 08:30:17 (GMT)