Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge topic 'watcom-updates' | Brad King | 2014-03-20 | 5 | -23/+67 |
|\ | |||||
| * | Watcom: Introduce OpenWatcom compiler id and fix compiler version | Jiri Malak | 2014-03-17 | 4 | -23/+39 |
| * | Watcom: Detect compiler target architecture and platform | Jiri Malak | 2014-03-17 | 1 | -0/+28 |
* | | Merge topic 'ExternalProject-no-download-progress' | Brad King | 2014-03-20 | 1 | -3/+11 |
|\ \ | |||||
| * | | ExternalProject: Add option to disable download progress (#14807) | Brad King | 2014-03-17 | 1 | -3/+11 |
| |/ | |||||
* | | Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH_2' | Brad King | 2014-03-20 | 1 | -24/+31 |
|\ \ | |||||
| * | | FindPkgConfig: small refactoring | Daniele E. Domenichelli | 2014-03-17 | 1 | -24/+31 |
| |/ | |||||
* | | Merge topic 'CheckTypeSize_#14056' | Brad King | 2014-03-20 | 1 | -3/+10 |
|\ \ | |||||
| * | | CheckTypeSize: Support for CXX when C language is not enabled | Daniele E. Domenichelli | 2014-03-15 | 1 | -3/+10 |
* | | | Merge topic 'Android-platform' | Brad King | 2014-03-20 | 1 | -0/+5 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Modules: Add an Andriod platform file | Stephen Kelly | 2014-03-20 | 1 | -0/+5 |
| |/ | |||||
* | | Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH' | Brad King | 2014-03-17 | 1 | -8/+150 |
|\ \ | |||||
| * | | FindPkgConfig: Extend PKG_CONFIG_PATH using CMake variables (#12926) | Daniele E. Domenichelli | 2014-03-17 | 1 | -8/+150 |
* | | | Merge topic 'intel-14-version' | Brad King | 2014-03-17 | 2 | -2/+10 |
|\ \ \ | |_|/ |/| | | |||||
| * | | CMake*CompilerId: Fix patch level for Intel >= 14.0 (#14806) | Brad King | 2014-03-14 | 2 | -2/+10 |
* | | | Merge topic 'cpack-deb-compression-types' | Brad King | 2014-03-14 | 1 | -1/+12 |
|\ \ \ | |||||
| * | | | CPackDeb: Add option to set compression type | Sean D'Epagnier | 2014-03-14 | 1 | -1/+12 |
* | | | | Merge topic 'FeatureSummary_missing_titles' | Brad King | 2014-03-14 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | FeatureSummary: Add missing titles for PACKAGES_FOUND and PACKAGES_NOT_FOUND | Daniele E. Domenichelli | 2014-03-14 | 1 | -0/+2 |
| |/ / / | |||||
* | | | | Merge topic 'different-python-header-libs-exe-0013794' | Brad King | 2014-03-14 | 2 | -9/+22 |
|\ \ \ \ | |||||
| * | | | | FindPython*: Document suggested find_package order (#13794) | Matt McCormick | 2014-03-14 | 2 | -0/+8 |
| * | | | | FindPythonInterp: Use consistent version with PythonLibs (#13794) | Matt McCormick | 2014-03-14 | 1 | -9/+14 |
* | | | | | Merge branch 'fix-find_dependency-empty-version' | Brad King | 2014-03-13 | 1 | -2/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | find_dependency: Give more helpful message if VERSION is empty | Aurélien Gâteau | 2014-03-13 | 1 | -2/+5 |
| * | | | | Merge branch 'fix-find_dependency-EXACT' into release | Brad King | 2014-03-12 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'fix-xcode-compiler-force' into release | Brad King | 2014-03-11 | 5 | -92/+37 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge topic 'FindPkgConfig-revise-docs' | Brad King | 2014-03-12 | 1 | -135/+118 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | FindPkgConfig: restructure documentation and document commands and variables | Daniele E. Domenichelli | 2014-03-10 | 1 | -135/+118 |
* | | | | | | | Merge topic 'fix-find_dependency-EXACT' | Brad King | 2014-03-12 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | find_dependency: Make sure invalid EXACT use can be reported. | Stephen Kelly | 2014-03-11 | 1 | -3/+3 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'fix-find_dependency-EXACT' into release | Brad King | 2014-03-10 | 1 | -2/+11 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'fix-Qt4-DBus-macro' into release | Brad King | 2014-03-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'python-3.4' into release | Brad King | 2014-03-10 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'FindRuby-2' into release | Brad King | 2014-02-28 | 1 | -4/+20 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge topic 'fix-xcode-compiler-force' | Brad King | 2014-03-12 | 5 | -92/+37 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Xcode: Convert forced CMAKE_<LANG>_COMPILER to full path if possible | Brad King | 2014-03-10 | 3 | -0/+3 |
| * | | | | | | | | | CMakeDetermine*Compiler: Factor out search for compiler in PATH | Brad King | 2014-03-10 | 5 | -92/+34 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge topic 'FindFreetype-path-suffix-without-include' | Brad King | 2014-03-11 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | FindFreetype: Add plain 'freetype2' path suffix | Adrien Destugues | 2014-03-10 | 1 | -2/+2 |
* | | | | | | | | | | Merge topic 'FindSDL-consistent-path-suffixes' | Brad King | 2014-03-11 | 5 | -5/+15 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | FindSDL: Make FindSDL_*.cmake path suffixes consistent with main module | Brad King | 2014-03-10 | 5 | -5/+15 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge topic 'fix-find_dependency-EXACT' | Brad King | 2014-03-11 | 1 | -2/+11 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | find_dependency: Don't propagate EXACT argument. | Stephen Kelly | 2014-03-06 | 1 | -2/+11 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge topic 'fix-Qt4-DBus-macro' | Brad King | 2014-03-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Qt4: Use correct qdbus executable in macro. | Stephen Kelly | 2014-03-10 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge topic 'dev/string-apis' | Brad King | 2014-03-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | FindCUDA: Fix a typo | Ben Boeckel | 2014-03-08 | 1 | -1/+1 |
* | | | | | | | | Merge topic 'python-3.4' | Brad King | 2014-03-07 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | FindPython{Interp,Libs}: Search for Python 3.4. | Matt McCormick | 2014-03-06 | 2 | -2/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge topic 'different-python-header-libs-exe-0013794' | Brad King | 2014-03-06 | 1 | -1/+0 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | |