summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'vcxproj-indentation' into releaseBrad King2017-02-231-0/+1
|\
| * VS: Fix .vcxproj indentationBrad King2017-02-231-0/+1
* | Merge branch 'clang-format-attrs' into releaseBrad King2017-02-229-44/+60
|\ \
| * | clang-format.bash: Use Git attributes to mark files for formattingBrad King2017-02-229-32/+27
| * | Define a custom Git attribute to mark sources using our C styleBrad King2017-02-221-5/+15
| * | Define a custom Git attribute to mark source files as generatedBrad King2017-02-222-10/+21
* | | Merge branch 'doc-cmake-language-makefile-vars' into releaseBrad King2017-02-221-0/+6
|\ \ \
| * | | Help: Clarify 'make-style' variable references in cmake-language(7)Michael Maltese2017-02-221-0/+6
| | |/ | |/|
* | | Merge branch 'FindCUDA-fix-init' into releaseBrad King2017-02-221-0/+1
|\ \ \
| * | | FindCUDA: Fix PTX selection with multiple architecturesBjoern Thiel2017-02-221-0/+1
| |/ /
* | | Merge branch 'vs2017-fallback-sdk' into releaseBrad King2017-02-212-0/+38
|\ \ \
| * | | VS2017: If Win 8.1 SDK is not available, use Win 10 SDKBrad King2017-02-212-0/+38
| |/ /
* | | Merge branch 'ExternalProject-update-docs' into releaseBrad King2017-02-211-2/+9
|\ \ \
| * | | ExternalProject: Clarify documented role of `INSTALL_DIR`Brad King2017-02-211-1/+4
| * | | ExternalProject: Clarify documented role of `INSTALL_COMMAND`Wilfried Goesgens2017-02-211-1/+5
| |/ /
* | | Merge branch 'cuda-separable-bool' into releaseBrad King2017-02-212-2/+4
|\ \ \
| * | | CUDA: Fix boolean interpretation of CUDA_SEPARABLE_COMPILATIONBrad King2017-02-202-2/+4
| |/ /
* | | Merge branch 'FindGTK2-old-sigc++' into releaseBrad King2017-02-211-1/+4
|\ \ \
| * | | FindGTK2: handle old libsigc++ versionsBen Boeckel2017-02-201-1/+4
* | | | Merge branch 'fix-CMP0017-path-case' into releaseBrad King2017-02-171-1/+1
|\ \ \ \
| * | | | Windows: Fix inconsistent behavior on changes to case of path to cmakeBrad King2017-02-171-1/+1
| | |/ / | |/| |
* | | | Merge branch 'FindHDF5-fix-header-langs' into releaseBrad King2017-02-171-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | FindHDF5: Fix search for language-specific header fileBrad King2017-02-171-2/+2
| * | | FindHDF5: Restore HDF5_<LANG>_INCLUDE_DIR advanced cache entry markBrad King2017-02-171-1/+1
| |/ /
* | | Merge branch 'autogen_fix_3.8' into releaseBrad King2017-02-151-2/+2
|\ \ \
| * | | Autogen: Fix headers not skippedSebastian Holtermann2017-02-151-2/+2
* | | | Merge branch 'fix-ctest_update-svn' into releaseBrad King2017-02-151-1/+4
|\ \ \ \
| * | | | ctest_update: Fix svn log and external loadingBrad King2017-02-151-1/+4
* | | | | Merge branch 'cuda-msvc-flags' into releaseBrad King2017-02-157-16/+17
|\ \ \ \ \
| * | | | | CUDA: Fix default compiler flags on WindowsBrad King2017-02-152-11/+12
| * | | | | CUDA: Fix test cases to not override CUDA flagsBrad King2017-02-155-5/+5
|/ / / / /
* | | | | Merge branch 'cuda-no-Os' into releaseBrad King2017-02-141-1/+1
|\ \ \ \ \
| * | | | | CUDA: Do not use non-existent -Os flag for nvccBrad King2017-02-141-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'cuda-with-c' into releaseBrad King2017-02-146-0/+51
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | CUDA: Link to standard system libraries when linking as CUDABrad King2017-02-143-0/+16
| * | | | Tests: Add case for CUDA with C but not C++Brad King2017-02-144-0/+35
* | | | | Merge branch 'backport-clang-format-cuda' into releaseBrad King2017-02-1420-88/+79
|\ \ \ \ \ | |/ / / /
| * | | | Tests: Run clang-format on CUDA codeBrad King2017-02-1416-86/+59
| * | | | Modules: Run clang-format on CUDA codeBrad King2017-02-141-1/+1
| * | | | clang-format.bash: Format CUDA source files tooBrad King2017-02-143-1/+19
* | | | | Merge branch 'execute_process-default-encoding' into releaseBrad King2017-02-132-5/+16
|\ \ \ \ \
| * | | | | execute_process: Restore no-decoding default behaviorBrad King2017-02-132-2/+2
| * | | | | Help: Improve execute_process ENCODING option documentationBrad King2017-02-131-4/+15
* | | | | | Merge branch 'cmake_provide_include_dir_for_toolkit' into releaseBrad King2017-02-138-4/+71
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | CUDA: Detect the toolkit include directoriesRobert Maynard2017-02-108-4/+71
| | |_|/ | |/| |
* | | | Merge branch 'sphinx-1.4' into releaseBrad King2017-02-106-17/+25
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Help: Fix cmake code block warnings produced by Sphinx 1.4Brad King2017-02-104-10/+10
| * | Utilities/Sphinx: Port qthelp css workaround to Sphinx 1.4Brad King2017-02-101-5/+9
| * | Utilities/Sphinx: Port cmake extension to Sphinx 1.4Gregor Jasny2017-02-101-2/+6
* | | Merge branch 'FeatureSummary-doc-cleanup' into releasev3.8.0-rc1Brad King2017-02-061-8/+10
|\ \ \