summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'vs-rc-flags'Brad King2017-06-225-0/+8
|\
| * VS: Fix support for rc /nologo flag in per-source COMPILE_FLAGSBrad King2017-06-225-0/+8
* | Merge topic 'android-unified-headers'Brad King2017-06-221-2/+6
|\ \
| * | Android: Fix include path for unified headersBrad King2017-06-221-2/+6
* | | Merge topic 'vs-cuda-fix-flags'Brad King2017-06-224-10/+44
|\ \ \
| * | | VS: Improve workaround for CUDA -Xcompiler placement bugBrad King2017-06-212-3/+14
| * | | VS: Fix target_compile_options for CUDABrad King2017-06-213-7/+30
* | | | Merge topic 'cuda-macos-rpath-in-tests'Brad King2017-06-227-23/+17
|\ \ \ \
| * | | | Tests: Simplify CUDA rpath on macOSBrad King2017-06-217-23/+17
* | | | | Merge topic 'vs_fix_configuration_error'Brad King2017-06-221-1/+1
|\ \ \ \ \
| * | | | | Tests: Verify registry value is not "/registry" before usingMichael Stürmer2017-06-211-1/+1
* | | | | | Merge topic 'vs_csharp_link_to_managed_cxx'Brad King2017-06-226-4/+54
|\ \ \ \ \ \
| * | | | | | Vs: allow CSharp targets to be linked to CXX targetsMichael Stürmer2017-06-216-4/+54
* | | | | | | CMake Nightly Date StampKitware Robot2017-06-221-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'release-3.9'Brad King2017-06-210-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'cuda-version-for-vs' into release-3.9Brad King2017-06-201-0/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'update-expat' into release-3.9Brad King2017-06-2011-171/+910
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'autogen_brace'Brad King2017-06-217-11/+69
|\ \ \ \ \ \ \
| * | | | | | | Autogen: Q_OBJECT behind brace testSebastian Holtermann2017-06-206-9/+65
| * | | | | | | Autogen: Check for Q_OBJECT/Q_GADGET after braceSebastian Holtermann2017-06-201-2/+4
* | | | | | | | Merge topic 'CheckTypeSize-arm-archs'Brad King2017-06-211-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | CheckTypeSize: Add support for arm architecturesDouglas McKenzie2017-06-201-0/+6
| |/ / / / / / /
* | | | | | | | Merge topic 'cuda-version-for-vs'Brad King2017-06-211-0/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Help: Update 3.9 release notes with recommended CUDA version for VSBrad King2017-06-201-0/+2
* | | | | | | | Merge topic 'update-expat'Brad King2017-06-2111-171/+910
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | expat: Fix compilation on systems without stdint.hBrad King2017-06-201-1/+11
| * | | | | | Merge branch 'upstream-expat' into update-expatBrad King2017-06-1910-169/+897
| |\ \ \ \ \ \
| | * | | | | | expat 2017-06-17 (c4446687)Expat Upstream2017-06-1911-186/+928
| * | | | | | | expat: Update script to get Expat 2.2.1Brad King2017-06-191-2/+3
* | | | | | | | CMake Nightly Date StampKitware Robot2017-06-211-1/+1
* | | | | | | | Merge topic 'FindICU-data-vars'Brad King2017-06-201-24/+68
|\ \ \ \ \ \ \ \
| * | | | | | | | FindICU: Search for packaged data filesRoger Leigh2017-06-171-24/+68
* | | | | | | | | Merge topic 'FindwxWidgets-fix-flag-parse'Brad King2017-06-201-19/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | FindwxWidgets: Fix parsing of cxxflags when paths contain -D or -IThierry Crozat2017-06-191-19/+15
* | | | | | | | | | Merge topic 'curses-form-advanced'Brad King2017-06-201-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | FindCurses: mark CURSES_FORM_LIBRARY as advancedDaniel Pfeifer2017-06-171-0/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'vs_dotnet_referenceprop_documentation'Brad King2017-06-201-6/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Vs: fix documentation for target property VS_DOTNET_REFERENCEPROP_*Michael Stürmer2017-06-171-6/+9
| |/ / / / / / / /
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-06-201-1/+1
* | | | | | | | | Merge topic 'vs_csharp_fix_win32manifest_param'Brad King2017-06-197-6/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Vs: remove /nowin32manifest from C# flags to enable default VS behaviorMichael Stürmer2017-06-167-6/+17
* | | | | | | | | | Merge topic 'FindHDF5-parallel-from-wrapper'Brad King2017-06-191-21/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | FindHDF5: Fix parallel detection when primary compiler is an HDF5 wrapperChuck Atkins2017-06-161-21/+27
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-06-191-1/+1
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-06-181-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-06-171-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'release-3.9'Brad King2017-06-160-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'doc-compile-features' into release-3.9Brad King2017-06-152-4/+4
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'doc-dev-maint'Brad King2017-06-161-0/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Help/dev: Add review instructions to maintainer guideBrad King2017-06-151-0/+30