summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'fix-circular-transitive-properties-segfault'Brad King2014-07-0222-0/+171
|\
| * Target: Return null when a transitive property is not defined.Stephen Kelly2014-07-011-0/+30
| * Genex: Fix stack overflow in transitive property evaluation.Stephen Kelly2014-07-0121-0/+141
* | Merge topic 'ninja-link-order-only-dependencies'Brad King2014-07-022-1/+12
|\ \
| * | Ninja: Add order-only dependencies to link commands (#14728)Ben Boeckel2014-07-012-1/+12
* | | Merge topic 'encoding-bugs'Brad King2014-07-022-15/+5
|\ \ \
| * | | Encoding: Replace some system calls with kwsys calls which handle unicode.Clinton Stimpson2014-07-012-15/+5
* | | | Merge topic 'FindJNI-ppc64le'Brad King2014-07-021-1/+1
|\ \ \ \
| * | | | FindJNI: search for ppc64 on ppc64le as wellDinar Valeev2014-07-011-1/+1
* | | | | Merge topic 'libarchive-encoding'Brad King2014-07-022-8/+56
|\ \ \ \ \
| * | | | | Encoding: Fix potential encoding issues with libarchive on Windows.Clinton Stimpson2014-07-022-8/+56
* | | | | | CMake Nightly Date StampKitware Robot2014-07-021-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'test-speedup-RunCMake.include_directories'Brad King2014-07-0119-44/+55
|\ \ \ \ \
| * | | | | Tests: Speed up RunCMake.include_directories testBrad King2014-06-3011-11/+11
| * | | | | Tests: Drop broken and now unused RunCMake_TEST_FILE optionBrad King2014-06-301-4/+1
| * | | | | Tests: Refactor RunCMake.include_directories to drop RunCMake_TEST_FILEBrad King2014-06-304-24/+35
| * | | | | Tests: Refactor RunCMake.File_Generate to drop RunCMake_TEST_FILEBrad King2014-06-304-5/+8
| | |_|_|/ | |/| | |
* | | | | Merge topic 'ninja-no-phony-sources'Brad King2014-07-014-44/+44
|\ \ \ \ \
| * | | | | Ninja: Skip generating empty phony rulesAdam Strzelecki2014-06-302-14/+21
| * | | | | Ninja: Don't limit custom cmd side-effects to build folder (#14972)Adam Strzelecki2014-06-301-16/+6
| * | | | | Ninja: Consider only custom commands deps as side-effects (#14972)Adam Strzelecki2014-06-302-14/+17
| |/ / / /
* | | | | Merge topic 'cuda_osx_clang'Brad King2014-07-012-4/+14
|\ \ \ \ \
| * | | | | FindCUDA: Fix OSX Clang & no C language enabledAdam Strzelecki2014-06-302-4/+14
| |/ / / /
* | | | | Merge topic 'FindVTK-drop-4.0-support'Brad King2014-07-012-101/+17
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | FindVTK: Drop support for finding VTK 4.0Brad King2014-07-012-101/+17
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2014-07-011-1/+1
* | | | Merge topic 'FindQt4-ignore-qt5'Brad King2014-06-301-1/+2
|\ \ \ \
| * | | | FindQt4: Don't further process qmake if it does not belong to Qt4Nils Gladitz2014-06-271-1/+2
* | | | | Merge topic 'vs14-generator'Brad King2014-06-3030-55/+968
|\ \ \ \ \
| * | | | | Help: Add notes for topic 'vs14-generator'Brad King2014-06-271-0/+4
| * | | | | Tests: Simplify LoadCommand testsBrad King2014-06-256-34/+0
| * | | | | FindBoost: Add -vc140 mangling for VS 14Brad King2014-06-251-0/+2
| * | | | | VS14: Fix Cl and Link flag tables as previous versionsBrad King2014-06-252-11/+5
| * | | | | VS14: Generate flag tables from MSBuild v140 tool filesBrad King2014-06-255-3/+759
| * | | | | VS14: Add Visual Studio 14 generator (#14982)Brad King2014-06-2516-9/+209
| * | | | | Tests/Preprocess: Remove unnecessary VS version testsBrad King2014-06-241-9/+0
* | | | | | Merge topic 'FindOpenMP-intel-qopenmp'Brad King2014-06-301-1/+4
|\ \ \ \ \ \
| * | | | | | FindOpenMP: ICC 15 deprecates -openmp, use -qopenmpAdam Strzelecki2014-06-271-1/+4
* | | | | | | Merge topic 'FindJPEG-new-windows-name'Brad King2014-06-301-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | FindJPEG: Add alternative name 'libjpeg'Sebastian Elsner2014-06-271-1/+1
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2014-06-301-1/+1
* | | | | | CMake Nightly Date StampKitware Robot2014-06-291-1/+1
* | | | | | CMake Nightly Date StampKitware Robot2014-06-281-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'release'Brad King2014-06-270-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'UseSWIG-fix-noproxy-check' into releaseBrad King2014-06-251-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bootstrap-cmake-locations' into releaseBrad King2014-06-252-4/+12
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'UseSWIG-fix-noproxy-check'Brad King2014-06-271-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | UseSWIG: Fix check for noproxy flag (#14990)Brad King2014-06-251-1/+1
* | | | | | | | Merge topic 'bootstrap-cmake-locations'Brad King2014-06-272-4/+12
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | bootstrap: Fix "make test" and "make package" targets (#14989)Brad King2014-06-252-0/+8