summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | regenerate-lexers.bash: Add option to check timestampsDaniel Franke2018-05-161-9/+22
| * | | | | | | regenerate-lexers.bash: Factor file names into variablesDaniel Franke2018-05-161-8/+14
* | | | | | | | Merge topic 'findqt4-extra-dirs'Brad King2018-05-161-27/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | FindQt4: New IMPORTS, PLUGINS and MKSPECS handlingChristian Pfeiffer2018-05-141-27/+19
* | | | | | | | | Merge topic 'subdirectory-linking'Brad King2018-05-1619-10/+110
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | target_link_libraries: Allow use with targets in other directoriesPatrick Stotko2018-05-1519-10/+110
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'dotnet_target_fw_init'Brad King2018-05-168-4/+60
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | added CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION variableMichael Stürmer2018-05-158-4/+60
* | | | | | | | | | Merge topic 'vs-nitpicks'Brad King2018-05-162-74/+70
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | cmVisualStudio10TargetGenerator: minor code cleanupVitaly Stakhovsky2018-05-112-74/+70
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-05-161-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'release-3.11'Brad King2018-05-150-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'fix-automoc-warnings' into release-3.11Brad King2018-05-152-8/+23
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'fix-automoc-warnings'Brad King2018-05-152-8/+23
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Qt4Macros: Don't AUTOMOC or AUTOUIC qt4-generated filesMatthew Woehlke2018-05-152-0/+15
| * | | | | | | | Qt4Macros: Use get_property/set_propertyMatthew Woehlke2018-05-151-8/+8
* | | | | | | | | Merge branch 'release-3.11'Brad King2018-05-150-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'custom-command-expand-empty' into release-3.11Brad King2018-05-143-0/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'autogen_register_info_files' into release-3.11Brad King2018-05-141-0/+3
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'autogen_register_info_files'Brad King2018-05-151-0/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Autogen: Register generated dependency filesSebastian Holtermann2018-05-141-0/+3
* | | | | | | | | | Merge topic 'custom-command-expand-empty'Brad King2018-05-153-0/+10
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | add_custom_{command,target}: Fix crash on empty expanded commandBrad King2018-05-143-0/+10
| |/ / / / / / /
* | | | | | | | CMake Nightly Date StampKitware Robot2018-05-151-1/+1
* | | | | | | | Merge topic 'FindPkgConfig-LINK_LIBRARIES'Brad King2018-05-144-21/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | FindPkgConfig: export the list of found libraries also as variableRolf Eike Beer2018-05-114-21/+47
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge topic 'cuda-vs-cuda-device-runtime'Brad King2018-05-141-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | VS: Link CUDA binaries with the device runtime library 'cudadevrt'Brad King2018-05-111-0/+2
* | | | | | | | | Merge branch 'release-3.11'Brad King2018-05-140-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'irsl-fortran-only-linux' into release-3.11Brad King2018-05-111-8/+10
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'irsl-fortran-only-linux'Brad King2018-05-141-8/+10
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | IRSL: Fix Intel library list for ifort-only setupsChristian Pfeiffer2018-05-111-8/+10
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'update-kwsys'Brad King2018-05-144-15/+30
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-05-114-15/+30
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | KWSys 2018-05-11 (46da6b14)KWSys Upstream2018-05-114-15/+30
* | | | | | | | | Merge topic 'xml-element-enhance'Brad King2018-05-143-61/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cmCTestLaunch: use cmXMLElement for XML generationVitaly Stakhovsky2018-05-113-61/+57
* | | | | | | | | | Merge topic 'findjpeg_static_fix'Brad King2018-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | FindJPEG: Add 'jpeg-static' to searched namesMichael Hofmann2018-05-111-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'cpack-nuget'Brad King2018-05-1416-32/+860
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | CPack: Add NuGet supportAlex Turbov2018-05-1116-6/+835
| * | | | | | | | | | Tests: Format `RunCPackVerifyResult.cmake` more consistentlyAlex Turbov2018-05-091-24/+24
| * | | | | | | | | | Tests: Fix comment for finding dpkg toolAlex Turbov2018-05-091-2/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-05-141-1/+1
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-05-131-1/+1
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-05-121-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'vs-refactor'Brad King2018-05-112-110/+92
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cmVisualStudio10TargetGenerator: refactorVitaly Stakhovsky2018-05-092-110/+92
* | | | | | | | | | Merge topic 'FindCUDA-sccache'Brad King2018-05-111-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | FindCUDA: Add support for sccacheWill Feng2018-05-091-4/+4