summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.16'Brad King2019-11-130-0/+0
|\
| * Merge topic 'FindwxWidgets-qt' into release-3.16Brad King2019-11-131-22/+26
| |\ | | | | | | | | | | | | | | | | | | fe54989fcd FindwxWidgets: Add support for wxQt Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4038
* | \ Merge topic 'FindwxWidgets-qt'Brad King2019-11-131-22/+26
|\ \ \ | | |/ | |/| | | | | | | | | | | | | fe54989fcd FindwxWidgets: Add support for wxQt Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4038
| * | FindwxWidgets: Add support for wxQtCraig Sturdy2019-11-121-22/+26
| | |
* | | Merge branch 'release-3.16'Brad King2019-11-130-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'swift-rpath-separator' into release-3.16Brad King2019-11-131-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | a27a1c7e88 Swift: Allow build and installed RPATHs to differ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4037
* | \ \ Merge topic 'swift-rpath-separator'Brad King2019-11-131-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | a27a1c7e88 Swift: Allow build and installed RPATHs to differ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4037
| * | | Swift: Allow build and installed RPATHs to differSaleem Abdulrasool2019-11-121-0/+1
| | |/ | |/| | | | | | | | | | | | | Define the RPATH separator to `:` so that CMake can reserve room to edit the ELF RPATH at install time. This enables the use of `BUILD_RPATH` and `INSTALL_RPATH` with differing values.
* | | CMake Nightly Date StampKitware Robot2019-11-131-1/+1
| | |
* | | Merge branch 'release-3.16'Kyle Edwards2019-11-120-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'add_custom_command-supports-COMMAND_EXPAND_LISTS' into release-3.16Kyle Edwards2019-11-121-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 64f40c5d09 Help: Both add_custom_command signatures support COMMAND_EXPAND_LISTS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4036
* | \ \ Merge topic 'add_custom_command-supports-COMMAND_EXPAND_LISTS'Kyle Edwards2019-11-121-1/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 64f40c5d09 Help: Both add_custom_command signatures support COMMAND_EXPAND_LISTS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4036
| * | | Help: Both add_custom_command signatures support COMMAND_EXPAND_LISTSMarc Aldorasi2019-11-111-1/+2
| | | |
* | | | Merge topic 'modernize-memory-management'Brad King2019-11-1224-190/+213
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f93385283f cmLocalGenerator: modernize memory management 101b5288ff cmAlgorithm: Extend cmAppend capabilities Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4028
| * | | | cmLocalGenerator: modernize memory managementMarc Chevrier2019-11-1123-190/+205
| | | | |
| * | | | cmAlgorithm: Extend cmAppend capabilitiesMarc Chevrier2019-11-111-0/+8
| | | | |
* | | | | Merge topic 'findcuda_stop_exposing_raw_pthreads_lib'Brad King2019-11-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46371132b3 FindCUDA: CUDA_LIBRARIES doesn't contain raw `-pthread` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4035
| * | | | | FindCUDA: CUDA_LIBRARIES doesn't contain raw `-pthread`Robert Maynard2019-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a person tried to pass `CUDA_LIBRARIES` to nvcc compiler it could fail as it might have `-pthread` which nvcc doesn't support. Instead we now use the `Threads::Threads` so that nvcc gets the correct `-Xcompiler -pthread` flag.
* | | | | | Merge topic 'cpack-pkg-background'Brad King2019-11-127-6/+185
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6069613a1 CPack: Set background image in macOS installer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3995
| * | | | | | CPack: Set background image in macOS installerSergey Larin2019-11-087-6/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now you can set a background image and it's parameters in productbuild and PackageMaker based installers.
* | | | | | | Merge branch 'release-3.16'Brad King2019-11-120-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge topic 'unity-HEADER_FILE_ONLY' into release-3.16Brad King2019-11-129-9/+43
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a5418320e Unity: Don't include sources with HEADER_FILE_ONLY property set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4023
* | \ \ \ \ \ \ Merge topic 'unity-HEADER_FILE_ONLY'Brad King2019-11-129-9/+43
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a5418320e Unity: Don't include sources with HEADER_FILE_ONLY property set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4023
| * | | | | | | Unity: Don't include sources with HEADER_FILE_ONLY property setCristian Adam2019-11-119-9/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19946 Fixes: #19947 Co-authored-by: Craig Scott <craig.scott@crascit.com>
* | | | | | | | Merge branch 'release-3.16'Brad King2019-11-120-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'objc-standard-docs' into release-3.16Brad King2019-11-1215-1/+238
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 665954fa8d ObjC: Document ObjC/ObjCXX standard properties / variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4031
* | \ \ \ \ \ \ \ Merge topic 'objc-standard-docs'Brad King2019-11-1215-1/+238
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 665954fa8d ObjC: Document ObjC/ObjCXX standard properties / variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4031
| * | | | | | | | ObjC: Document ObjC/ObjCXX standard properties / variablesCristian Adam2019-11-1115-1/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19919
* | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'objc-xcode-flags' into release-3.16Brad King2019-11-126-8/+61
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb42e1ed43 ObjC: Add OBJC/OBJCXX flags to Xcode projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4020
* | \ \ \ \ \ \ \ \ Merge topic 'objc-xcode-flags'Brad King2019-11-126-8/+61
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb42e1ed43 ObjC: Add OBJC/OBJCXX flags to Xcode projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4020
| * | | | | | | | | ObjC: Add OBJC/OBJCXX flags to Xcode projectsCristian Adam2019-11-116-8/+61
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19936
* | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'update-expat' into release-3.16Brad King2019-11-1224-4843/+4037
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50bc359184 expat: Update CMake build for 2.2.9 b63a5c88a2 Merge branch 'upstream-expat' into update-expat 1712885b4f expat 2019-09-25 (a7bc26b6) 512fabaa9d expat: Update script to get Expat 2.2.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4032
* | \ \ \ \ \ \ \ \ Merge topic 'update-expat'Brad King2019-11-1224-4843/+4037
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50bc359184 expat: Update CMake build for 2.2.9 b63a5c88a2 Merge branch 'upstream-expat' into update-expat 1712885b4f expat 2019-09-25 (a7bc26b6) 512fabaa9d expat: Update script to get Expat 2.2.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4032
| * | | | | | | | | expat: Update CMake build for 2.2.9Brad King2019-11-111-1/+0
| | | | | | | | | |
| * | | | | | | | | Merge branch 'upstream-expat' into update-expatBrad King2019-11-1122-4840/+4036
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-expat: expat 2019-09-25 (a7bc26b6)
| | * | | | | | | | | expat 2019-09-25 (a7bc26b6)Expat Upstream2019-11-1122-4852/+4052
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libexpat/libexpat.git at commit a7bc26b69768f7fb24f0c7976fae24b157b85b13 (R_2_2_9).
| * | | | | | | | | | expat: Update script to get Expat 2.2.9Brad King2019-11-111-2/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'reference-IMPORTED_IMPLIB-more' into release-3.16Brad King2019-11-121-0/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2944bf46d5 Help: Reference IMPORTED_IMPLIB from the IMPORTED_LOCATION documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4034
* | \ \ \ \ \ \ \ \ \ Merge topic 'reference-IMPORTED_IMPLIB-more'Brad King2019-11-121-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2944bf46d5 Help: Reference IMPORTED_IMPLIB from the IMPORTED_LOCATION documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4034
| * | | | | | | | | | Help: Reference IMPORTED_IMPLIB from the IMPORTED_LOCATION documentationMarc Aldorasi2019-11-111-0/+3
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16698
* | | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'pch-cray-classic' into release-3.16Brad King2019-11-121-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77a8f9ecbc Tests: Fix ExportImport PCH expectation on Cray Classic compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4033
* | \ \ \ \ \ \ \ \ \ Merge topic 'pch-cray-classic'Brad King2019-11-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77a8f9ecbc Tests: Fix ExportImport PCH expectation on Cray Classic compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4033
| * | | | | | | | | | Tests: Fix ExportImport PCH expectation on Cray Classic compilerBrad King2019-11-111-1/+1
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not expect PCH-included definitions for this compiler.
* | | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'resolve-full-path-at-generate-time' into release-3.16Brad King2019-11-122-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48d1456b3d UnityBuild: Resolve full paths of unity source includes ec2f130aa9 cmFileAPI: Resolve full path in PCH source comparison Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4029
* | \ \ \ \ \ \ \ \ \ Merge topic 'resolve-full-path-at-generate-time'Brad King2019-11-122-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48d1456b3d UnityBuild: Resolve full paths of unity source includes ec2f130aa9 cmFileAPI: Resolve full path in PCH source comparison Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4029