summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'no-assert-missing-objlib'Brad King2014-05-075-2/+31
|\
| * cmTarget: Don't assert on object libraries for configure-time location.Stephen Kelly2014-05-065-2/+31
* | Merge branch 'release'Brad King2014-05-070-0/+0
|\ \
| * \ Merge branch 'hpux-compile' into releaseBrad King2014-05-062-2/+38
| |\ \
| * \ \ Merge branch 'backport-kwsys-compile-fix' into releaseBrad King2014-05-061-28/+15
| |\ \ \
| * \ \ \ Merge branch 'InstallRequiredSystemLibraries-vs12-mfc' into releaseBrad King2014-05-061-4/+21
| |\ \ \ \
* | \ \ \ \ Merge topic 'backport-kwsys-compile-fix'Brad King2014-05-070-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | KWSys SystemInformation: Include backtrace APIs whenever we use themBrad King2014-05-061-28/+15
| |/ / / /
* | | | | Merge topic 'osx-iframework'Brad King2014-05-073-3/+24
|\ \ \ \ \
| * | | | | OS X: Use -iframework for system framework directoriesMikołaj Siedlarek2014-05-073-3/+24
* | | | | | Merge topic 'xcode-sdkroot'Brad King2014-05-071-14/+29
|\ \ \ \ \ \
| * | | | | | Xcode: Find fallback SDK if one matching the OS version doesn't exist.Clinton Stimpson2014-05-061-14/+29
* | | | | | | Merge topic 'InstallRequiredSystemLibraries-vs12-mfc'Brad King2014-05-071-4/+21
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | InstallRequiredSystemLibraries: MBCS MFC is optional on VS 12 (#14903)Felix Krause2014-05-061-4/+21
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'ExternalProject_labels'Brad King2014-05-071-0/+5
|\ \ \ \ \ \
| * | | | | | ExternalProject: Set FOLDER property to targetsDaniele E. Domenichelli2014-05-051-0/+3
| * | | | | | ExternalProject: Set LABELS property to targetsDaniele E. Domenichelli2014-05-051-0/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'update-kwsys'Brad King2014-05-072-28/+18
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-05-062-28/+18
| |\ \ \ \ \ \
| | * | | | | | KWSys 2014-05-05 (f3a36760)KWSys Robot2014-05-062-28/+18
* | | | | | | | CMake Nightly Date StampKitware Robot2014-05-071-1/+1
* | | | | | | | Merge topic 'CMAKE_CXX_KNOWN_FEATURES-global-property'Brad King2014-05-069-60/+64
|\ \ \ \ \ \ \ \
| * | | | | | | | Features: Make CMAKE_CXX_KNOWN_FEATURES a property.Stephen Kelly2014-05-029-60/+64
* | | | | | | | | Merge topic 'dont-rewrite-moc-parameter-file'Brad King2014-05-063-26/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Qt4: Extend the Qt4Targets test to cover dir and target moc parameters.Stephen Kelly2014-05-062-25/+48
| * | | | | | | | | Qt4: write moc parameter file only when content has changedPeter Kümmel2014-04-251-1/+3
* | | | | | | | | | Merge topic 'hpux-compile'Brad King2014-05-060-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | CompileFlags: add better selection which aCC version gets -AA +hpxstd98 flagsRolf Eike Beer2014-05-061-2/+6
| * | | | | | | | CompileFlags: Add -AA +hpxstd98 on HP-UX 11.11 with aCCRolf Eike Beer2014-05-062-1/+32
| * | | | | | | | CompileFlags: Test for C++ features after selecting flagsRolf Eike Beer2014-05-061-1/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-05-061-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-05-051-1/+1
* | | | | | | CMake Nightly Date StampKitware Robot2014-05-041-1/+1
* | | | | | | CMake Nightly Date StampKitware Robot2014-05-031-1/+1
* | | | | | | CMake Nightly Date StampKitware Robot2014-05-021-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'UseSWIG-guess_module_name'Brad King2014-05-011-0/+6
|\ \ \ \ \ \
| * | | | | | Help: Add notes for topic 'UseSWIG-guess_module_name'Brad King2014-05-011-0/+6
* | | | | | | Merge topic 'ExternalData-missing-not-fatal'Brad King2014-05-011-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Help: Add notes for topic 'ExternalData-missing-not-fatal'Brad King2014-05-011-0/+8
* | | | | | | | Merge branch 'release'Brad King2014-05-010-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'ExternalProject-verify-cmake-var' into releaseBrad King2014-04-301-1/+1
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'file-generate-if-different'Brad King2014-05-015-12/+37
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | file(GENERATE): Only write the file if content is different.Stephen Kelly2014-04-305-12/+37
* | | | | | | | | | Merge topic 'FindCUDA-cubin-fatbin'Brad King2014-05-012-29/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Help: Add notes for topic 'FindCUDA-cubin-fatbin'Brad King2014-05-011-0/+5
| * | | | | | | | | | FindCUDA: Add support for compilation to fatbin & cubin modulesTobias Zirr2014-04-301-29/+60
* | | | | | | | | | | Merge topic 'ExternalProject-verify-cmake-var'Brad King2014-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | ExternalProject: Fix path to cmake in verify scriptBrad King2014-04-301-1/+1
* | | | | | | | | | | Merge topic 'drop-release-on-ferrari'Brad King2014-05-013-29/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Utilities/Release: Drop IRIX binary generation on ferrariBrad King2014-04-303-29/+0