summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2014-12-241-1/+1
|
* Merge branch 'release'Brad King2014-12-230-0/+0
|\
| * Merge branch 'ninja-fix-crash-on-error' into releaseBrad King2014-12-231-1/+4
| |\
| * \ Merge branch 'CPackComponent-docs-fix' into releaseBrad King2014-12-221-2/+2
| |\ \
| * \ \ Merge branch 'backport-suncc-fixes' into releaseBrad King2014-12-221-2/+3
| |\ \ \
* | \ \ \ Merge topic 'doc-octothorpe-escaping'Brad King2014-12-231-0/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8d70a914 Help: Add 3.1 release note about '#' escaping in Makefiles (#15322)
| * | | | | Help: Add 3.1 release note about '#' escaping in Makefiles (#15322)Brad King2014-12-231-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.1.0-rc1~174^2 (Makefile: Handle '#' in COMPILE_OPTIONS, 2014-08-12) was not compatible with code that tries to workaround the original bug. Unfortunately there is no good way to fix the bug in a compatible way. Add a release note to call attention to the change.
* | | | | | Merge topic 'ninja-fix-crash-on-error'Brad King2014-12-231-1/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 9a13fcbf Ninja: Do not crash when CMAKE_<LANG>_COMPILE_OBJECT is empty (#15325)
| * | | | | Ninja: Do not crash when CMAKE_<LANG>_COMPILE_OBJECT is empty (#15325)Brad King2014-12-221-1/+4
| |/ / / /
* | | | | Merge topic 'base64-constref'Brad King2014-12-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 82fbf490 cmCTestTestHandler: take reference to temporary string instead of doing a copy
| * | | | | cmCTestTestHandler: take reference to temporary string instead of doing a copyRolf Eike Beer2014-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This will increase the lifetime of the temporary until the end of the function.
* | | | | | Merge topic 'CPackComponent-docs-fix'Brad King2014-12-231-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 64016393 Help: Small fixes in CPackComponent documentation
| * | | | | Help: Small fixes in CPackComponent documentationDaniele E. Domenichelli2014-12-221-2/+2
| | |/ / / | |/| | |
* | | | | Merge topic 'AppleClang-5.1-features'Brad King2014-12-238-7/+121
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb83cdaa Help: Add notes for topic 'AppleClang-5.1-features' bd6b42c1 Features: Record for AppleClang 5.1 b341799e Tests: Fix RunCMake.CompileFeatures test NonValidTarget2 case
| * | | | | Help: Add notes for topic 'AppleClang-5.1-features'Brad King2014-12-231-0/+5
| | | | | |
| * | | | | Features: Record for AppleClang 5.1Stephen Kelly2014-12-226-7/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apple's Clang 5.1 already supports most of the C and C++ features CMake enumerates.
| * | | | | Tests: Fix RunCMake.CompileFeatures test NonValidTarget2 caseBrad King2014-12-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark the generated source file with the GENERATED property explicitly since it is not marked automatically as the output of any custom command. Mark both the 0 and 1 variants so it works no matter the outcome of the generator expression.
* | | | | | Merge topic 'cleanup-ExpandListArgument-usage'Brad King2014-12-235-67/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2a489c7 Remove some temporary vectors for ExpandListArgument. 0f99feec cmGeneratorExpression: Remove unused header. 722f1a71 CTest: Expand a string directly into a container.
| * | | | | | Remove some temporary vectors for ExpandListArgument.Stephen Kelly2014-12-183-60/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand directly into the target when possible.
| * | | | | | cmGeneratorExpression: Remove unused header.Stephen Kelly2014-12-181-2/+0
| | | | | | |
| * | | | | | CTest: Expand a string directly into a container.Stephen Kelly2014-12-181-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the follow-up loop to use a const_iterator to log the content.
* | | | | | | Merge topic 'ctest-coverage-extra-line-error'Brad King2014-12-231-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c4984b4 ctest_coverage: Fix error message to report the file name
| * | | | | | | ctest_coverage: Fix error message to report the file nameVladislav Vinogradov2014-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print file name instead of line content for "Looks like there are more lines in the file:" error message.
* | | | | | | | Merge topic 'add-FindGSL'Brad King2014-12-238-0/+296
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b28e3b2 FindGSL: Add module to find the GNU Scientific Library
| * | | | | | | | FindGSL: Add module to find the GNU Scientific LibraryKelly Thompson2014-12-178-0/+296
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2014-12-231-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge topic 'backport-suncc-fixes'Brad King2014-12-220-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 107dcac3 Fix compilation with the Oracle / Sun compiler (#15318)
| * | | | | | | Fix compilation with the Oracle / Sun compiler (#15318)Chuck Atkins2014-12-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One piece of code has some ambiguous type deduction that seems to resolve correctly for most compilers but not for the Oracle compiler. Make it more explicit.
* | | | | | | | Merge topic 'macho-parser'Brad King2014-12-225-22/+493
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c294a115 Mach-O: Use Mach-O parser to extract install names instead of otool. e42da307 Mach-O: Add Mach-O parser for OS X and iOS.
| * | | | | | | | Mach-O: Use Mach-O parser to extract install names instead of otool.Clinton Stimpson2014-12-221-22/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has much better performance than calling "otool" or "xcrun -r otool" to extract install names for rpath support. Fixes bug #15178.
| * | | | | | | | Mach-O: Add Mach-O parser for OS X and iOS.Clinton Stimpson2014-12-224-0/+481
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This parser also supports fat binaries which archive multiple Mach-O binaries.
* | | | | | | | Merge branch 'release'Brad King2014-12-220-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'doc-mingw-makefiles' into releaseBrad King2014-12-222-6/+15
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'bootstrap-solaris' into releaseBrad King2014-12-181-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'doc-INTERFACE-target-type' into releaseBrad King2014-12-171-1/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge topic 'doc-mingw-makefiles'Brad King2014-12-222-6/+15
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | 844f98c1 Help: Clarify MinGW v. MSYS Makefiles generators (#15319)
| * | | | | | | | Help: Clarify MinGW v. MSYS Makefiles generators (#15319)Brad King2014-12-192-6/+15
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain the usage of each generator more clearly and reference each as an alternative to the other. Suggested-by: Craig Hicks <hicks111@hotmail.com>
* | | | | | | | Merge topic 'nightly-binary-updates'Brad King2014-12-222-4/+14
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 202056cd Utilities/Release: Build Windows and OS X binaries with native SSL d64caa53 Utilities/Release: Fix name of OS X 10.6+ x86_64-only binary
| * | | | | | | Utilities/Release: Build Windows and OS X binaries with native SSLBrad King2014-12-222-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the nightly binaries, turn of CMAKE_USE_OPENSSL on Windows and OS X 10.6+ platforms. This will activate the new curl behavior to use the OS-native SSL/TLS implementation.
| * | | | | | | Utilities/Release: Fix name of OS X 10.6+ x86_64-only binaryBrad King2014-12-221-2/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.1.0-rc1~52^2 (Make the OSX 10.6+ release x86_64 only, 2014-09-29) we forgot to remove the name "universal" from the binary name. Since the binary is no longer universal, use "x86_64" instead. While at it, update the deployment target to actually be 10.6.
* | | | | | | CMake Nightly Date StampKitware Robot2014-12-221-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-12-211-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-12-201-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'bootstrap-solaris'Brad King2014-12-191-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | 44c6db6e bootstrap: Fix syntax for Solaris 10 shell (#15317)
| * | | | | bootstrap: Fix syntax for Solaris 10 shell (#15317)Brad King2014-12-181-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.1.0-rc2~7^2 (Workaround for short jump tables on PA-RISC, 2014-11-04) we added use of shell syntax not supported on the Solaris shell. Avoid using the '!' operator. Reported-by: Friedrich Haubensak <hsk@imb-jena.de>
* | | | | Merge topic 'update-kwsys'Brad King2014-12-191-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e9acb6d Merge branch 'upstream-kwsys' into update-kwsys 1f7de543 KWSys 2014-12-18 (87c65319)
| * \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-12-181-0/+16
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | KWSys 2014-12-18 (87c65319)KWSys Robot2014-12-181-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 87c65319 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' cc4046a8..87c65319 Sean McBride (1): 87c65319 SharedForward: Suppress clang -Wcast-qual warnings with conditional pragma Change-Id: I2f79780385aca7e0caa24e5bb0c0b4106b786c37
* | | | | | Merge topic 'osx-cfbundle-tweaks'Brad King2014-12-194-18/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b189c599 Tests: Run CFBundleTest only with valid configuration 3a605693 Xcode: Call IsCFBundleOnApple to decide if bundle is being built 207b7af0 cmTarget: Use GetCFBundleDirectory within GetFullNameInternal
| * | | | | | Tests: Run CFBundleTest only with valid configurationBrad King2014-12-192-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The verification script needs to know the configuration tested.