summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Teach find_library and find_package to search lib32 paths (#11260)Daniel Scharrer2016-06-1028-27/+110
* Merge branch 'release'Brad King2016-06-100-0/+0
|\
| * Merge branch 'cmake-gui-osx-symlink-qt5-plugin' into releaseBrad King2016-06-091-0/+34
| |\
| * \ Merge branch 'doc-ctest_update' into releaseBrad King2016-06-082-0/+9
| |\ \
| * \ \ Merge branch 'fix-libarchive-openssl-no-hashes' into releaseBrad King2016-06-071-0/+1
| |\ \ \
* | \ \ \ Merge topic 'refactor-cmLocalGenerator-flags'Brad King2016-06-104-58/+66
|\ \ \ \ \
| * | | | | cmLocalGenerator: Move GetFrameworkFlags implementation to private helperTobias Hunger2016-06-091-9/+19
| * | | | | cmLocalGenerator: Adopt GetFrameworkFlags methodTobias Hunger2016-06-094-54/+55
| * | | | | cmCommonTargetGenerator: De-duplicate CMAKE_BUILD_TYPE lookupTobias Hunger2016-06-081-6/+3
* | | | | | Merge topic 'FindProtobuf-proto-in-subdirs'Brad King2016-06-101-0/+8
|\ \ \ \ \ \
| * | | | | | FindProtobuf: fix protobuf_generate_*() to handle proto files in subdirs.Vladimír Vondruš2016-06-091-0/+8
* | | | | | | Merge topic 'FindFreetype-dedup-arguments'Brad King2016-06-101-23/+12
|\ \ \ \ \ \ \
| * | | | | | | FindFreetype: Factor out common find command argumentsStuart Mentzer2016-06-091-23/+12
| |/ / / / / /
* | | | | | | Merge topic 'FindCUDA-android'Brad King2016-06-102-48/+287
|\ \ \ \ \ \ \
| * | | | | | | FindCUDA: Refactor Android(Tegra) supportBoris Fomitchev2016-06-092-45/+282
| * | | | | | | FindCUDA: Adjust vertical whitespaceBoris Fomitchev2016-06-091-3/+5
* | | | | | | | Merge topic 'FindOpenSSL-BoringSSL'Brad King2016-06-101-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | FindOpenSSL: Do not assume that the version regex finds somethingVladimír Vondruš2016-06-091-4/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'watcom-workaround'Brad King2016-06-101-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Tests: Restore fix to Plugin test on Watcom compilerBrad King2016-06-091-1/+3
* | | | | | | | | Merge topic 'cmake-gui-osx-symlink-qt5-plugin'Brad King2016-06-101-0/+34
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | cmake-gui: Teach Qt5 where plugins are when launched through a symlinkRobert Maynard2016-06-091-0/+34
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-06-101-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge topic 'ninja-no-ranlib-windows'Brad King2016-06-092-1/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Run ranlib on archives only if the tool is availableBrad King2016-06-082-1/+19
* | | | | | | | | Merge topic 'refactor-cmLocalGenerator-flags'Brad King2016-06-095-16/+17
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | cmLocalGenerator: Pass configuration to GetTargetFlagsTobias Hunger2016-06-085-16/+17
* | | | | | | | | Merge topic 'small-cleanups'Brad King2016-06-099-43/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prefer std::ostream& over derivatives as parametersDaniel Pfeifer2016-06-086-14/+13
| * | | | | | | | | cmake: remove unnused member VerboseDaniel Pfeifer2016-06-082-8/+2
| * | | | | | | | | cmake: Fix constness of methodsStephen Kelly2016-06-082-14/+15
| * | | | | | | | | cmake: Make internal method file staticStephen Kelly2016-06-082-4/+2
| * | | | | | | | | Parser: Merge identical conditionsStephen Kelly2016-06-081-3/+0
| |/ / / / / / / /
* | | | | | | | | Merge topic 'xmlwriter'Brad King2016-06-093-85/+85
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | CPack/PackageMaker: port to cmXMLWriterDaniel Pfeifer2016-06-093-85/+85
| |/ / / / / / / /
* | | | | | | | | Merge topic 'java-export-targets'Brad King2016-06-0915-17/+402
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | UseJava: Fix race condition creating java class listMatthew Woehlke2016-06-091-5/+5
| * | | | | | | | Help: Add notes for topic 'java-export-targets'Brad King2016-06-071-0/+6
| * | | | | | | | Tests: Add test for exported JARsMatthew Woehlke2016-06-0710-0/+187
| * | | | | | | | UseJava: Add infrastructure to export targetsMatthew Woehlke2016-06-072-0/+192
| * | | | | | | | Tests/Java: Clean up style of Java test codeMatthew Woehlke2016-06-072-12/+12
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-06-091-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge topic 'add-FindVulkan'Brad King2016-06-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Tests/FindVulkan: Run clang-formatBrad King2016-06-081-1/+1
* | | | | | | | | Merge topic 'fix-libarchive-openssl-no-hashes'Brad King2016-06-081-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | libarchive: Restore OpenSSL include directory from upstreamBrad King2016-06-071-0/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge topic 'add-FindVulkan'Brad King2016-06-088-0/+149
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Add FindVulkan.cmake.Matthäus G. Chajdas2016-06-088-0/+149
* | | | | | | | Merge topic 'doc-ctest_update'Brad King2016-06-082-0/+9
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Help: Document CTest Git fetch-and-reset behaviorBrad King2016-06-081-0/+5