summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Fix Example appearing in target property list of contentsCraig Scott2017-10-072-2/+3
|
* Merge branch 'findopenmp-fix-verbose' into release-3.10Brad King2017-10-061-2/+13
|\ | | | | | | Merge-request: !1348
| * FindOpenMP: Fix link flags being used for compileChristian Pfeiffer2017-10-051-2/+13
| | | | | | | | Fixes: #17307
* | Merge branch 'minor-fixes' into release-3.10Brad King2017-10-064-6/+8
|\ \ | | | | | | | | | Merge-request: !1349
| * | cmInstallCommandArguments: do not access static members through `this`Matthias Maennich2017-10-051-3/+3
| | |
| * | cmProcessTools: fix minor issue introduced by 595feb3Matthias Maennich2017-10-051-1/+1
| | |
| * | cmGeneratorTarget: remove dead codeMatthias Maennich2017-10-051-1/+1
| | | | | | | | | | | | explicitLibraries can never be nullptr at this point
| * | cmcmd: let operator<< for NumberFormatter reset the stream's format flagsMatthias Maennich2017-10-051-1/+3
| | |
* | | Merge branch 'cpack-dmg-explicit-hfs' into release-3.10v3.10.0-rc1Brad King2017-10-051-2/+2
|\ \ \ | | | | | | | | | | | | Merge-request: !1354
| * | | CPack: Fix PackageMaker .dmg HFS+ creation on macOS APFS hostsBrad King2017-10-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running `hdiutil create`, specify the HFS+ filesystem explicitly. Otherwise `hdiutil` may choose a filesystem based on the host. We do not want to create APFS images for `.dmg` packages because they may not mount on macOS versions prior to 10.12. This was missed in commit 39b50975d9 (CPack: Fix .dmg HFS+ creation on macOS APFS hosts, 2017-10-02). Reported-by: Alan Garny
* | | | CMake 3.10.0-rc1 version updateBrad King2017-10-052-4/+4
| | | |
* | | | Help: Drop development topic notes to prepare releaseBrad King2017-10-052-9/+0
| | | | | | | | | | | | | | | | | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* | | | Merge topic 'doc-3.10-relnotes'Brad King2017-10-0547-309/+267
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0565192a Help: Organize and revise 3.10 release notes dd5835c0 Help: Consolidate 3.10 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1353
| * | | | Help: Organize and revise 3.10 release notesBrad King2017-10-051-129/+168
| | | | | | | | | | | | | | | | | | | | | | | | | Add section headers similar to the 3.9 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * | | | Help: Consolidate 3.10 release notesBrad King2017-10-0547-309/+228
| | |/ / | |/| | | | | | | | | | | | | | Run the `Utilities/Release/consolidate-relnotes.bash` script to move notes from `Help/release/dev/*` into `Help/release/3.10.rst`.
* | | | Merge topic 'xcode9-ios-tests'Brad King2017-10-055-4/+22
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | d210b281 Xcode: Adjust tests to drop of 32bit iOS architectures Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1347
| * | | Xcode: Adjust tests to drop of 32bit iOS architecturesGregor Jasny2017-10-055-4/+22
| | | |
* | | | Merge topic 'cuda-default-link-launcher'Brad King2017-10-051-1/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7914fb82 CUDA: Fix default selection of host compiler used to drive linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1341
| * | | | CUDA: Fix default selection of host compiler used to drive linkingBrad King2017-10-041-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no explicit `CMAKE_CUDA_HOST_COMPILER` is specified by the user then we do not pass `-ccbin` to `nvcc`. In this case, nvcc's link line we extract during the compiler identification step may not have the absolute path to the host compiler it uses to drive linking. If it is not absolute, use the `PATH=` from nvcc's output to search for it since that is the one `nvcc` would use. This fixes our internal `CMAKE_CUDA_HOST_LINK_LAUNCHER` value used to construct link lines when using `CUDA` as the linker language. It needs to match the host compiler `nvcc` uses internally during compilation. Fixes: #17323
* | | | | Merge topic 'FindCUDA-run_nvcc-CMP0007'Brad King2017-10-051-5/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b09c20c FindCUDA: Fix CMP0007 warning in run_nvcc.cmake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1340
| * | | | | FindCUDA: Fix CMP0007 warning in run_nvcc.cmakeUmar Arshad2017-10-041-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set `CMP0007` to `NEW` for the entire script. The script comes with CMake and is aware of the policy's behavior, so set the policy to ensure that its warnings do not show up during the build phase. Fixes: #16579
* | | | | | Merge topic 'test-load_command-simplify'Brad King2017-10-052-14/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e55d69cf Tests: Remove ancient workaround in LoadCommand tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1342
| * | | | | | Tests: Remove ancient workaround in LoadCommand testsBrad King2017-10-042-14/+0
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'find-matlab-r2017b'Brad King2017-10-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f156b2fb FindMatlab: Add support for MATLAB 2017b Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raffi Enficiaud <raffi.enficiaud@free.fr> Merge-request: !1343
| * | | | | | FindMatlab: Add support for MATLAB 2017bJamie Snape2017-10-041-1/+1
| |/ / / / /
* | | | | | Merge topic 'findopenmp-fix-version'Brad King2017-10-051-2/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31206157 FindOpenMP: Fix version if OpenMP doesn't work Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1344
| * | | | | FindOpenMP: Fix version if OpenMP doesn't workChristian Pfeiffer2017-10-041-2/+6
| | |_|_|/ | |/| | |
* | | | | CMake Nightly Date StampKitware Robot2017-10-051-1/+1
|/ / / /
* | | | Merge topic 'clang-format'Brad King2017-10-041-2/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 574d6943 clang-format.bash: minor fixes to support MacOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1339
| * | | clang-format.bash: minor fixes to support MacOSMatthias Maennich2017-10-031-2/+4
| |/ / | | | | | | | | | | | | | | | | | | - sed on Mac does not support embedded sed statements, hence eliminating the non-matches via grep - xargs on Mac does not support -d, but does support -0, hence replacing
* | | Merge branch 'release-3.9'Brad King2017-10-040-0/+0
|\ \ \
| * | | CMake 3.9.4v3.9.4Brad King2017-10-041-1/+1
| | | |
* | | | Merge topic 'test-macos-updates'Brad King2017-10-042-3/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58d9297e Tests: Fix RunCMake.Framework ios arch for Xcode 9 b8dd7a70 Tests: Fix RunCMake.Framework expected output on macOS 10.13 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1338
| * | | | Tests: Fix RunCMake.Framework ios arch for Xcode 9Brad King2017-10-031-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Xcode 9 comes with the iPhoneOS 11.0 SDK that does not support the `armv7` architecture. For this SDK version and newer, use `arm64`.
| * | | | Tests: Fix RunCMake.Framework expected output on macOS 10.13Brad King2017-10-031-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | The archiver output in the case of universal binaries has changed slightly. Update our expected output to match. While at it, drop unnecessary leading and trailing `.*`.
* | | | Merge topic 'vs-no-empty-link-version'Brad King2017-10-041-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b419b99 VS: Do not emit empty linker Version tag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1332
| * | | | VS: Do not emit empty linker Version tagVitaly Stakhovsky2017-10-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This empty element does nothing, so simply remove it to simplify generated `.vcxproj` files.
* | | | | Merge topic 'compiler-version-internal'Brad King2017-10-049-3/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bdb8cd2 IAR: Detect compiler platform version b96ca728 Add infrastructure to detect secondary compiler version information f952f16d Help: Fix placement of one variable in cmake-variables manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1324
| * | | | | IAR: Detect compiler platform versionStefan Andersson2017-10-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `__IAR_SYSTEMS_ICC__` provides additional version information that we need to determine correct usage of the compiler. Extract and store it as `CMAKE_<LANG>_COMPILER_VERSION_INTERNAL`. Issue: #17264
| * | | | | Add infrastructure to detect secondary compiler version informationBrad King2017-10-038-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_<LANG>_COMPILER_VERSION_INTERNAL` variable to hold a secondary/internal compiler version number detected at the same time as the primary compiler version. This will be useful for some compilers where we need such a number to determine correct usage. Inspired-by: Stefan Andersson <tfosm@hotmail.com> Suggested-by: Norbert Lange <norbert.lange@andritz.com> Issue: #17264
| * | | | | Help: Fix placement of one variable in cmake-variables manualBrad King2017-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND` variable was recently added slightly in the wrong place for the sorted ordering.
* | | | | | Merge topic 'src-flags-genex-target'Brad King2017-10-046-8/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 303cd703 VS,Xcode: Fix TARGET_PROPERTY genex in source COMPILE_FLAGS property Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Nikita Nemkin <nikita@nemkin.ru> Merge-request: !1336
| * | | | | | VS,Xcode: Fix TARGET_PROPERTY genex in source COMPILE_FLAGS propertyBrad King2017-10-036-8/+20
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This already worked in other generators. Also add a test case. Fixes: #17314
* | | | | | CMake Nightly Date StampKitware Robot2017-10-041-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'FindProtobuf-gen-desc'Brad King2017-10-037-11/+137
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1299f4cc FindProtobuf: add flag to allow descriptor files to be generated 4e91be95 FindProtobuf: Refactor custom command output listing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1301
| * | | | FindProtobuf: add flag to allow descriptor files to be generatedPeter Mitrano2017-10-027-4/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The .desc files will be in the same folder as the generated .cc and .h files. - Paths to generate .desc files are stored in a variable passed in - This is only implemented for C++ - Remove legacy ARGS - Add test that generates and uses C++ protobuf message - Add test that checks that the generated .desc file can be instantiated with DynamicMessageFactory - Add Help rst for new feature
| * | | | FindProtobuf: Refactor custom command output listingBrad King2017-10-021-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce duplication by storing the custom command outputs in variables. Also, since custom command outputs are automatically marked as generated we do not need to do so explicitly.
* | | | | CMake Nightly Date StampKitware Robot2017-10-031-1/+1
| |/ / / |/| | |
* | | | Merge topic 'file-path-checksum-cpp11'Brad King2017-10-022-39/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23ad08dd Migrate cmFilePathChecksum to C++11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1334
| * | | | Migrate cmFilePathChecksum to C++11Sebastian Holtermann2017-10-012-39/+37
| | | | |