summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'csharp_support_compiler_detection'Brad King2016-12-1610-2/+391
|\ | | | | | | | | 5c6c0344 C# support: add compiler detection for MSVC
| * C# support: add compiler detection for MSVCMichael Stürmer2016-12-1510-2/+391
| |
* | Merge topic 'copyright-year'Brad King2016-12-161-1/+1
|\ \ | | | | | | | | | | | | 40e56149 Copyright.txt: Update year range to end in 2017
| * | Copyright.txt: Update year range to end in 2017Brad King2016-12-151-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-12-161-1/+1
|/ /
* | Merge topic 'FindPNG-typo'Brad King2016-12-151-1/+1
|\ \ | | | | | | | | | | | | 9fdad82c FindPNG: Fix small typo fix in module help
| * | FindPNG: Fix small typo fix in module helpMaxime Morel2016-12-151-1/+1
| | |
* | | Merge topic 'codelite-build-and-clean-targets-enhancement'Brad King2016-12-153-25/+56
|\ \ \ | | | | | | | | | | | | | | | | f1739418 CodeLite: Make build/clean/rebuild operations optionally target-centric
| * | | CodeLite: Make build/clean/rebuild operations optionally target-centricMinze Zwerver2016-12-143-25/+56
| | | | | | | | | | | | | | | | | | | | When `CMAKE_CODELITE_USE_TARGETS` is enabled, these operations should be target-centric too.
* | | | Merge topic 'doc-clarify-CMAKE_CL_64'Brad King2016-12-151-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 58f02aaa Help: Clarify meaning of CMAKE_CL_64
| * | | | Help: Clarify meaning of CMAKE_CL_64Brad King2016-12-141-2/+3
| | |/ / | |/| | | | | | | | | | Closes: #16504
* | | | Merge topic 'update-kwsys'Brad King2016-12-155-30/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da03e2d6 Merge branch 'upstream-KWSys' into update-kwsys a9ea66bd KWSys 2016-12-14 (95a7e234) 24130757 update-kwsys: Update repository URL
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-12-144-29/+53
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-12-14 (95a7e234)
| | * | | | KWSys 2016-12-14 (95a7e234)KWSys Upstream2016-12-144-31/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 95a7e234ffd0c6bdfaa8b21c59a119198c050164 (master). Upstream Shortlog ----------------- Ben Boeckel (1): e0967411 Add a script to help update third-party sources Brad King (10): 98505f79 Add script to update GitSetup from upstream 365edba8 GitSetup: Tell Git not to export .gitattributes 41a7fe5b Add pre-commit hook to check whether SetupForDevelopment must re-run 17a1200c Convert developer setup scripts away from Gerrit Code Review 5f206c3a Tell Git to use a distinct conflict marker size in `.rst` files 33f828d4 README: Convert from `.txt` to `.rst` markup 56b707dd README: Add section about reporting bugs 140357ea CONTRIBUTING: Document contribution through the Kitware GitLab Instance 4b7bf8e4 Tell Git not to export any `.sh` or `.bash` scripts e25eb8dc CONTRIBUTING: Add step for running developer setup script GitSetup Upstream (3): fed3d191 GitSetup 2012-09-27 (341043cf) a0144297 GitSetup 2016-12-13 (8af10838) 868c1e68 GitSetup 2016-12-13 (cd5ada6d)
| * | | | | update-kwsys: Update repository URLBrad King2016-12-141-1/+1
| | |/ / / | |/| | | | | | | | | | | | | KWSys is now hosted on Kitware's GitLab instance.
* | | | | CMake Nightly Date StampKitware Robot2016-12-151-1/+1
|/ / / /
* | | | Merge topic 'cuda-implicit-libs'Brad King2016-12-141-23/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e3f404fe CUDA: Implement nvcc implicit link line extraction more robustly
| * | | | CUDA: Implement nvcc implicit link line extraction more robustlyBrad King2016-12-131-23/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not assume that the implicit link line is the last line of the output from `nvcc -v`. Instead first find the `LIBRARIES=` line, and then look for that content on a later line. It appears twice. First on a call to `nvlink`, which we ignore. Later it appears on the implicit link line. Extract the latter line. On failure, abort with a `FATAL_ERROR` so that the user does not try to build without proper link information. Once we have the line, parse it with `separate_arguments` using the `UNIX_COMMAND` option just like `CMakeParseImplicitLinkInfo` already does. This robustly parses the command line and removes quoting. Then extract the first argument as the host link launcher.
* | | | | Merge topic 'rebuild-lexers'Brad King2016-12-1417-3357/+3747
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c5df1f16 Regenerate lexer source code
| * | | | | Regenerate lexer source codeDaniel Pfeifer2016-12-1417-3357/+3747
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise the manual procedure in the `*Lexer.in.l` files. Some of our post-processing steps are no longer necessary with the current set of supported compilers. Some steps changed with newer versions of flex. Then regenerate all lexers with flex version 2.6.1.
* | | | | | Merge topic 'dotnet_hint_references'Brad King2016-12-146-10/+98
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55da7e50 VS: add support for .NET references with hint paths
| * | | | | | VS: add support for .NET references with hint pathsMichael Stürmer2016-12-136-10/+98
| | |_|_|/ / | |/| | | |
* | | | | | Merge topic 'GNUInstallDirs-cache-type'Brad King2016-12-141-64/+66
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53b5d634 GNUInstallDirs: Set UNINITALIZED cache properties to type PATH c968213d GNUInstallDirs: Unify path logic into helper macros
| * | | | | | GNUInstallDirs: Set UNINITALIZED cache properties to type PATHRoger Leigh2016-12-121-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also convert the path to a cmake path
| * | | | | | GNUInstallDirs: Unify path logic into helper macrosRoger Leigh2016-12-121-66/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Unify path handling: Rather than repeat the same logic for each individual path create two macros which can be used throughout the module. - Capitalise helpstrings to match the conventions used by the standard CMake properties
* | | | | | | Merge topic 'update-kwsys-upstream-link'Brad King2016-12-141-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23a35edf pre-commit: Update KWSys rejection message for new upstream location
| * | | | | | | pre-commit: Update KWSys rejection message for new upstream locationBrad King2016-12-131-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-12-141-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'try_compile-lang-std-cuda'Brad King2016-12-139-9/+114
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1371eec4 try_compile: extend CMP0067 to honor language standards for CUDA.
| * | | | | | | | try_compile: extend CMP0067 to honor language standards for CUDA.Robert Maynard2016-12-129-9/+114
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge topic 'GetPrerequisites-fix-find_program-call'Brad King2016-12-131-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | 1d1f29f4 GetPrerequisites: Fix call to find_program for `ri` tool
| * | | | | | | GetPrerequisites: Fix call to find_program for `ri` toolMartin Koegler2016-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `find_program` does not work with `${a};${b}` as a search path. Use separate arguments to `PATHS`.
* | | | | | | | CMake Nightly Date StampKitware Robot2016-12-131-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'cuda-fixups'Brad King2016-12-122-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1a55079 CUDA: Fix Cuda.Complex test case extern function signatures 7552d16d CUDA: Fix default compiler flag initialization
| * | | | | | | CUDA: Fix Cuda.Complex test case extern function signaturesBrad King2016-12-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the return types of the extern function declared in `main.cpp` match those in the method implementations.
| * | | | | | | CUDA: Fix default compiler flag initializationBrad King2016-12-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.7.0-rc1~392^2 (Honor CMAKE_<LANG>_FLAGS[_<CONFIG>]_INIT set in toolchain files, 2016-07-05) our convention is to initialize compiler flag variables via `string(APPEND)` rather than `set()`. Fix the convention for `CMAKE_CUDA_FLAGS[_<CONFIG>]_INIT`.
* | | | | | | | Merge topic 'document_cuda_standard_property'Brad King2016-12-1210-0/+113
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45054119 Help: Document CUDA_STANDARD and related properties
| * | | | | | | | Help: Document CUDA_STANDARD and related propertiesRobert Maynard2016-12-0910-0/+113
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge topic 'clang-tidy'Brad King2016-12-1259-152/+140
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b932cd42 clang-tidy: apply misc-redundant-expression fixes 88da3d68 clang-tidy: apply misc-suspicious-string-compare fixes 58c66393 clang-tidy: apply readability-static-definition-in-anonymous-namespace fixes 85bfddda clang-tidy: apply readability-redundant-control-flow fixes 2988abd9 clang-tidy: apply modernize-use-bool-literals fixes a74e6893 clang-tidy: apply readability-redundant-string-init fixes cac529dd clang-tidy: apply performance-faster-string-find fixes 7c9db8f8 clang-tidy: apply performance-unnecessary-value-param fixes
| * | | | | | | | clang-tidy: apply misc-redundant-expression fixesDaniel Pfeifer2016-12-123-5/+4
| | | | | | | | |
| * | | | | | | | clang-tidy: apply misc-suspicious-string-compare fixesDaniel Pfeifer2016-12-122-18/+11
| | | | | | | | |
| * | | | | | | | clang-tidy: apply readability-static-definition-in-anonymous-namespace fixesDaniel Pfeifer2016-12-123-23/+19
| | | | | | | | |
| * | | | | | | | clang-tidy: apply readability-redundant-control-flow fixesDaniel Pfeifer2016-12-124-4/+0
| | | | | | | | |
| * | | | | | | | clang-tidy: apply modernize-use-bool-literals fixesDaniel Pfeifer2016-12-1222-50/+49
| | | | | | | | |
| * | | | | | | | clang-tidy: apply readability-redundant-string-init fixesDaniel Pfeifer2016-12-1219-31/+31
| | | | | | | | |
| * | | | | | | | clang-tidy: apply performance-faster-string-find fixesDaniel Pfeifer2016-12-126-7/+7
| | | | | | | | |
| * | | | | | | | clang-tidy: apply performance-unnecessary-value-param fixesDaniel Pfeifer2016-12-126-14/+19
| | | | | | | | |
* | | | | | | | | Merge topic 'xcode-message-extension'Brad King2016-12-125-0/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ac0c393 Help: Add notes for topic 'xcode-message-extension' 0ae46321 Xcode: Add target property to override explicitFileType 7ecac703 Xcode: Add target property to override productType
| * | | | | | | | | Help: Add notes for topic 'xcode-message-extension'Brad King2016-12-121-0/+7
| | | | | | | | | |
| * | | | | | | | | Xcode: Add target property to override explicitFileTypeGregor Jasny2016-12-034-0/+15
| | | | | | | | | |