Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge topic 'AutomocIncludedDotMocFileHandling' | David Cole | 2011-12-07 | 1 | -0/+1 |
|\ | |||||
| * | Merge branch 'master' into AutomocIncludedDotMocFileHandling | David Cole | 2011-12-07 | 35 | -119/+364 |
| |\ | |||||
| * | | automoc: add variable CMAKE_AUTOMOC_STRICT_MODE, to enable strict parsing | Alex Neundorf | 2011-12-02 | 1 | -0/+1 |
* | | | Merge topic 'topics/FindCUDA/Misc-fixes' | David Cole | 2011-12-07 | 1 | -10/+11 |
|\ \ \ | |||||
| * | | | Miscellaneous fixes. | James Bigler | 2011-12-06 | 1 | -10/+11 |
* | | | | Merge topic 'topics/FindCUDA/Multi-dir-clash' | David Cole | 2011-12-07 | 1 | -10/+54 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Make CUDA working directory unique for each target. | James Bigler | 2011-12-06 | 1 | -10/+54 |
| |/ / | |||||
* | | | Merge topic 'topics/FindCUDA/Quote-fixes' | David Cole | 2011-12-06 | 2 | -21/+21 |
|\ \ \ | |||||
| * | | | Fixes for handling quotes in args and other places (Fix Bug 11726 and 12099). | James Bigler | 2011-12-06 | 2 | -21/+21 |
| |/ / | |||||
* | | | Merge topic 'topics/FindCUDA/FixCUDAInUNCPath' | David Cole | 2011-12-06 | 1 | -2/+16 |
|\ \ \ | |||||
| * | | | Add work around for CUDA in UNC paths. | James Bigler | 2011-12-05 | 1 | -2/+16 |
| |/ / | |||||
* | | | Merge topic 'topics/FindCUDA/linux-double-build' | David Cole | 2011-12-06 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Reset dependency file list when a dependency disappeared. | James Bigler | 2011-12-05 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge topic 'GNU-to-MS' | David Cole | 2011-12-06 | 15 | -0/+116 |
|\ \ \ | |||||
| * | | | Add CMAKE_GNUtoMS option to convert GNU .dll.a to MS .lib | Brad King | 2011-12-05 | 6 | -0/+70 |
| * | | | Load platform files that need to know the ABI when possible | Brad King | 2011-12-05 | 6 | -0/+36 |
| * | | | Fortran: Detect pointer size in gfortran on MinGW | Brad King | 2011-12-05 | 3 | -0/+10 |
* | | | | Merge topic 'CUDAv3.2PathChanges' | David Cole | 2011-12-06 | 1 | -11/+14 |
|\ \ \ \ | |||||
| * | | | | Added support for CUDA_PATH which is present in the CUDA toolkit 3.2 onward. | James Bigler | 2011-12-05 | 1 | -11/+14 |
| | |/ / | |/| | | |||||
* | | | | Merge topic 'findlapack-0012477-new' | David Cole | 2011-12-06 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | FindLAPACK: Fix linking to static LAPACK on Unix (#12477) | Alexey Ozeritsky | 2011-12-05 | 1 | -1/+1 |
* | | | | | Merge topic 'TinyCC-compiler' | David Cole | 2011-12-06 | 3 | -0/+15 |
|\ \ \ \ \ | |||||
| * | | | | | TinyCC: Add default compilation flags (#12605) | Mathieu Malaterre | 2011-12-05 | 1 | -0/+7 |
| * | | | | | TinyCC: Add compiler info for shared libs on Linux (#12605) | Brad King | 2011-12-02 | 2 | -0/+5 |
| * | | | | | Recognize the Tiny C Compiler (#12605) | Brad King | 2011-12-02 | 1 | -0/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Fix path quoting in Qt4 macros | Pierre-Francois Laquerre | 2011-12-04 | 1 | -9/+9 |
|/ / / / | |||||
* | | | | Merge topic 'FindZLIB-use-ZLIB_ROOT' | David Cole | 2011-12-01 | 1 | -10/+25 |
|\ \ \ \ | |||||
| * | | | | FindZLIB: Search under ZLIB_ROOT if it is set | Brad King | 2011-11-30 | 1 | -10/+25 |
| | |/ / | |/| | | |||||
* | | | | Merge topic 'useqt4-fix-declarative' | David Cole | 2011-12-01 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Qt4: Fix dependencies of QtDeclartive. | Clinton Stimpson | 2011-11-29 | 1 | -3/+3 |
| |/ / / | |||||
* | | | | Merge topic 'automoc_qt5' | David Cole | 2011-12-01 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | moc is now part of the Qt5Core module | Stephen Kelly | 2011-11-26 | 1 | -1/+1 |
| * | | | Merge remote-tracking branch 'origin/master' into automoc_qt5 | Stephen Kelly | 2011-11-10 | 4 | -19/+89 |
| |\ \ \ | |||||
* | \ \ \ | Merge topic 'EclipseImprovedSourceProject' | David Cole | 2011-11-22 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Eclipse: use new variable CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT | Alex Neundorf | 2011-11-19 | 1 | -2/+2 |
* | | | | | | Merge topic 'FindPNG_Provide_PNG_INCLUDE_DIRS_Variable' | David Cole | 2011-11-22 | 1 | -6/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | FindPNG: provide PNG_INCLUDE_DIRS, as the readme.txt says (#11312) | Alex Neundorf | 2011-11-18 | 1 | -6/+11 |
| |/ / / / / | |||||
* | | | | | | Merge topic 'FindBISON-version-regex' | David Cole | 2011-11-22 | 1 | -2/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | FindBISON: Fix matching output of "bison --version" | Rolf Eike Beer | 2011-11-18 | 1 | -2/+2 |
| * | | | | | | FindBISON: Fix bison++ version parsing to avoid "Offending entry" | Ondrej Balaz | 2011-11-11 | 1 | -2/+11 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge topic 'FixGettextPoProcessingWithMultipleDots' | David Cole | 2011-11-22 | 1 | -6/+9 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | FindGettext: two more fixes for files with multiple dots | Alex Neundorf | 2011-11-16 | 1 | -2/+4 |
| * | | | | | -make GETTEXT_PROCESS_PO_FILES() work with files with multiple dots | Alex Neundorf | 2011-11-15 | 1 | -1/+2 |
| * | | | | | Strip trailing whitespace | Alex Neundorf | 2011-11-15 | 1 | -3/+3 |
| |/ / / / | |||||
* | | | | | Merge topic 'qt4-deploy-module' | David Cole | 2011-11-15 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Check QtCore without warning. | Mike McQuaid | 2011-11-14 | 1 | -1/+5 |
* | | | | | | Merge topic 'FindBoost-vs11-issue-12568' | David Cole | 2011-11-15 | 1 | -4/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | FindBoost: Use MSVC11 to find Boost on Windows (#12568) | Mateusz Loskot | 2011-11-10 | 1 | -4/+6 |
* | | | | | | | Merge topic 'automoc_qt5' | David Cole | 2011-11-15 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Don't assume the existence of QT_MAJOR_VERSION. | Stephen Kelly | 2011-11-09 | 1 | -0/+1 |