summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | | Xcode: Call IsCFBundleOnApple to decide if bundle is being builtGregor Jasny2014-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Narrow down the decision if a CFBundle is built to one place. This is a preparation patch to add another target property which, if set, will imply BUNDLE. Having only one function which will have to look at both properties helps to keep code clean. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
| * | | | | | cmTarget: Use GetCFBundleDirectory within GetFullNameInternalGregor Jasny2014-12-171-9/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace duplicated code by call to GetCFBundleDirectory. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | Merge topic 'install-EXPORT-absolute-prefix'Brad King2014-12-1910-41/+73
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd089e08 install: Allow absolute EXPORT destination with relative targets (#15258)
| * | | | | | install: Allow absolute EXPORT destination with relative targets (#15258)Brad King2014-12-1510-41/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When install(EXPORT) is given an absolute destination we cannot compute the install prefix relative to the installed export file location. Previously we disallowed installation of targets in such exports with a relative destination, but did not enforce this for target property values besides the location of the main target file. This could lead to broken installations when the EXPORT is installed to an absolute path but usage requirements are specified relative to the install prefix. Since an EXPORT installed to an absolute destination cannot be relocated we can just hard-code the value of CMAKE_INSTALL_PREFIX as the base for relative paths. This will allow absolute install(EXPORT) destinations to work with relative destinations for targets and usage requirements. Extend the ExportImport test with a case covering this behavior.
* | | | | | | CMake Nightly Date StampKitware Robot2014-12-191-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'update-kwsys'Brad King2014-12-184-15/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3470704f Merge branch 'upstream-kwsys' into update-kwsys 6a5ab894 KWSys 2014-12-16 (cc4046a8)
| * \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-12-174-15/+58
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | KWSys 2014-12-16 (cc4046a8)KWSys Robot2014-12-174-15/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ cc4046a8 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' dec9c30b..cc4046a8 Brad King (2): 9c3eacf8 Add CONTRIBUTING.rst file with instructions to contribute cc4046a8 Directory: Work around PGI problem with Linux Large File Support Jean-Christophe Fillion-Robin (2): c38ba638 SystemInformation: Improve Get(Available/Total)VirtualMemory for windows 58308145 SystemInformation: Improve comments in private implementation Change-Id: Ic033444a9c03a8a8b5195e7dac108af2aec79fa6
* | | | | | | Merge topic 'vs-nsight-tegra-min-api'Brad King2014-12-189-2/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eeaa25e5 Add 'ANDROID_API_MIN' target property to set Android Target MIN API
| * | | | | | | Add 'ANDROID_API_MIN' target property to set Android Target MIN APIDmitry Polyanitsa2014-12-179-2/+30
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a 'CMAKE_ANDROID_API_MIN' variable to set the property default. Teach the VS generator to write the MIN API value into Nsight Tegra project files.
* | | | | | | Merge topic 'fix-sha2-cast-constness'Brad King2014-12-181-12/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4d2d72f sha2: Fix -Wcast-qual warnings by adding const to some casts
| * | | | | | | sha2: Fix -Wcast-qual warnings by adding const to some castsSean McBride2014-12-171-12/+12
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'doc-INTERFACE-target-type'Brad King2014-12-181-1/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | 473446ab Help: Add INTERFACE_LIBRARY to TYPE target property documentation
| * | | | | | Help: Add INTERFACE_LIBRARY to TYPE target property documentationTim Blechmann2014-12-171-1/+2
| | | | | | |
* | | | | | | Merge topic 'test-memcheck-with-RunCMake'Brad King2014-12-1876-301/+354
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ca6bdf0 Tests: Move CTestTestMemcheck tools into Tests/CMakeLib 1651dc96 Tests: Move CTestTestMemcheck cases into a RunCMake.CTestMemcheck test
| * | | | | | | Tests: Move CTestTestMemcheck tools into Tests/CMakeLibBrad King2014-12-185-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dummy memcheck tools we build for the RunCMake.CTestMemcheck tests require CMakeLib, so put them in a Tests/CMakeLib/PseudoMemcheck directory.
| * | | | | | | Tests: Move CTestTestMemcheck cases into a RunCMake.CTestMemcheck testBrad King2014-12-1871-256/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CTestTestMemcheck test cases all try to check the ctest output with a regular expression. They fail intermittently due to ordering of the portions of the output that come from stdout and stderr being mixed. Convert all the test cases to use the RunCMake infrastructure to match stdout and stderr separately.
* | | | | | | | Merge topic 'curl-darwinssl'Brad King2014-12-182-0/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4563257 curl: Use OS X SSL/TLS native implementation
| * | | | | | | | curl: Use OS X SSL/TLS native implementationBrad King2014-12-182-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On OS X, when CMAKE_USE_OPENSSL is OFF, use the OS implementation. This will allow the OS-configured CA list to be trusted automatically. This is supported on OS X 10.6 and above using AppleClang, Clang, and GNU compilers.
* | | | | | | | | CMake Nightly Date StampKitware Robot2014-12-181-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge topic 'ctest_memcheck-no-empty-BC-output'Brad King2014-12-171-0/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 1c812979 ctest_memcheck: Do not open empty BC output file name
| * | | | | | | ctest_memcheck: Do not open empty BC output file nameBrad King2014-12-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cmCTestMemCheckHandler::PostProcessBoundsCheckerTest return early if the output file name is empty. We already do this in the similar cmCTestMemCheckHandler::AppendMemTesterOutput method.
* | | | | | | | Merge topic 'test-RunCMake-updates'Brad King2014-12-172-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29533380 Tests: Allow RunCMake expected result code to be a regex a85ee8b8 Tests: Simplify RunCMake test extra argument passing da7155f5 Tests: Allow RunCMake tests to pass generator expressions