summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'topics/FindCUDA/Add-CUDA_SOURCE_PROPERTY_FORMAT'David Cole2012-08-241-19/+29
|\
| * Added CUDA_SOURCE_PROPERTY_FORMAT. Allows setting per file format (OBJ or PTX)James Bigler2012-08-201-19/+29
* | Merge topic 'pic-docs'David Cole2012-08-242-2/+5
|\ \
| * | Fix unfortunate documentation error for PIC feature.Stephen Kelly2012-08-202-2/+5
* | | Merge topic 'minor-docs-fixes'David Cole2012-08-243-7/+4
|\ \ \
| * | | Remove duplicate 'of' from docs.Stephen Kelly2012-08-201-1/+1
| * | | Remove incorrect doc string for link type enumStephen Kelly2012-08-191-3/+0
| * | | Fix some typos in the docs.Stephen Kelly2012-08-191-3/+3
| * | | Add missing whitespace to docs.Stephen Kelly2012-08-191-1/+1
| |/ /
* | | Merge topic 'DependencyScanning_13474'David Cole2012-08-244-19/+50
|\ \ \
| * | | -fix Java dependency scanning, broken in previous commitAlex Neundorf2012-08-202-2/+3
| * | | -fix line lengthAlex Neundorf2012-08-201-2/+2
| * | | fix #13474: also rescan dependencies if the depender does not existAlex Neundorf2012-08-172-17/+47
* | | | Merge topic 'test-ObjectLibrary-lang'David Cole2012-08-242-2/+2
|\ \ \ \
| * | | | Tests/ObjectLibrary: Do not enable CXX in subdirectoriesBrad King2012-08-202-2/+2
* | | | | Merge topic 'topics/FindCUDA/Fix-g3-again'David Cole2012-08-241-1/+11
|\ \ \ \ \
| * | | | | Replace -g3 with -g for CUDA 4.1 and 4.2 in addition to CUDA < 3.0.James Bigler2012-06-191-1/+11
* | | | | | CMake Nightly Date StampKitware Robot2012-08-241-1/+1
* | | | | | Merge topic 'Qt4Macros-fix-resource-parsing'Brad King2012-08-231-3/+5
|\ \ \ \ \ \
| * | | | | | Qt4Macros: Fix recently broken resource file parsingBrad King2012-08-221-3/+5
* | | | | | | CMake Nightly Date StampKitware Robot2012-08-231-1/+1
* | | | | | | CMake Nightly Date StampKitware Robot2012-08-221-1/+1
* | | | | | | CMake Nightly Date StampKitware Robot2012-08-211-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'qt4_use_modules'David Cole2012-08-202-0/+32
|\ \ \ \ \ \
| * | | | | | Add new qt4_use_modules function.Stephen Kelly2012-08-192-0/+32
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'read-less-from-version-headers'David Cole2012-08-209-30/+35
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | read less from version headers into variablesRolf Eike Beer2012-08-199-30/+35
| | |_|_|/ | |/| | |
* | | | | Merge topic 'no-regex-escape-space'David Cole2012-08-203-3/+3
|\ \ \ \ \
| * | | | | do not escape spaces in regular expressionsRolf Eike Beer2012-08-193-3/+3
| |/ / / /
* | | | | Merge topic 'FindGTK2_12306'David Cole2012-08-201-0/+1
|\ \ \ \ \
| * | | | | FindGTK2: Add GTK2_CAIROMMCONFIG_INCLUDE_DIR for cairommconfig.hPhilip Lowman2012-08-181-0/+1
* | | | | | Merge topic 'FindOpenSceneGraph_13094'David Cole2012-08-203-4/+25
|\ \ \ \ \ \
| * \ \ \ \ \ Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094Philip Lowman2012-08-1830-391/+342
| |\ \ \ \ \ \
| * | | | | | | FindOpenSceneGraph: CMake variable OSG_DIR influences detection now tooPhilip Lowman2012-08-183-4/+25
* | | | | | | | Merge topic 'lib64-cleanup'David Cole2012-08-2030-391/+342
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | use PATH_SUFFIXES to simplify find_* callsRolf Eike Beer2012-08-1419-242/+195
| * | | | | | | use the find_* functions ENV parameterRolf Eike Beer2012-08-1428-151/+149
* | | | | | | | Merge topic 'fix-13236-mark-vars-as-advanced'David Cole2012-08-201-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | ProcessorCount: Mark find_program vars as advanced (#13236)David Cole2012-08-171-0/+7
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'cmcldeps-needs-cl'David Cole2012-08-201-18/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Ninja: don't crash on returned 0 pointerPeter Kümmel2012-08-171-21/+18
| * | | | | | | | Ninja: cmcldeps needs a compilerPeter Kümmel2012-08-171-4/+7
| |/ / / / / / /
* | | | | | | | Merge topic 'fix-13315-incorrect-mfc-file-name'David Cole2012-08-201-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | InstallRequiredSystemLibraries: Use correct file names (#13315)David Cole2012-08-171-2/+3
| |/ / / / / / /
* | | | | | | | Merge topic 'HandleMacFrameworkIncludeDirs_13465'David Cole2012-08-202-1/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | -fix line lengthAlex Neundorf2012-08-161-3/+3
| * | | | | | | | Eclipse on OSX: improve handling of framework include dirs (#13367)Alex Neundorf2012-08-161-0/+10
| * | | | | | | | Eclipse on OSX: fix handling of framework include dirs (#13464)Alex Neundorf2012-08-161-1/+4
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge topic 'RemoveNonworkingKDE4Test'David Cole2012-08-202-104/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | remove non-working KDE4 testAlex Neundorf2012-08-162-104/+0
| |/ / / / / / /