summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-global-props-for-all-targets'Brad King2018-09-287-0/+106
|\ | | | | | | | | | | | | | | 36489b85aa VS: Add test for CMAKE_VS_GLOBALS 22e670a306 VS: Add option to set VS_GLOBAL_* for all targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2345
| * VS: Add test for CMAKE_VS_GLOBALSMikhail Korolev2018-09-283-0/+53
| |
| * VS: Add option to set VS_GLOBAL_* for all targetsMikhail Korolev2018-09-254-0/+53
| | | | | | | | Fixes: #18287
* | Merge topic 'vs-msbuild-platform'Brad King2018-09-283-3/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 98e4fbdc06 VS: Pass platform when invoking MSBuild 6597428c36 ctest: Fix generator platform under --build-nocmake d8294fefe8 cmake: Fix generator platform under --build mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2413
| * | VS: Pass platform when invoking MSBuildBrad King2018-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSBuild expects a `/p:Platform=...` argument to tell it which platform to build among those in the `.vcxproj` files. We have not historically had to do this because we generate only one platform. However, when a project uses `include_external_msproject` the included project file may have other platforms. Fixes: #18308
| * | ctest: Fix generator platform under --build-nocmakeBrad King2018-09-251-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | When constructing a global generator instance in `--build-and-test` mode we need to set the platform passed by `--build-generator-platform` directly on the generator. The old code that set it on the `cmake` class instance did nothing because that only affects cache initialization, which is not done by `--build-nocmake`.
| * | cmake: Fix generator platform under --build modeBrad King2018-09-251-0/+8
| | |
* | | Merge topic 'addvs2017arm64'Brad King2018-09-281-17/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22282d6931 Tests: Add VSWinStore* test for VS 2017 ARM64 57b9a072cb Tests: Teach VSWinStore* tests to pass the architecture as a parameter Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2389
| * | | Tests: Add VSWinStore* test for VS 2017 ARM64Gilles Khouzam2018-09-261-0/+1
| | | |
| * | | Tests: Teach VSWinStore* tests to pass the architecture as a parameterGilles Khouzam2018-09-261-17/+18
| |/ / | | | | | | | | | | | | Instead of specifying the architecture in the generator name, pass it as the generator platform. This has been preferred since CMake 3.1.
* | | CMake Nightly Date StampKitware Robot2018-09-281-1/+1
| | |
* | | Merge topic 'asm-path-from-c'Brad King2018-09-271-4/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7ab5843c26 ASM: Search for full path even when using C or C++ compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2418
| * | | ASM: Search for full path even when using C or C++ compilerRaul Laasner2018-09-261-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `CMAKE_{C,CXX}_COMPILER` is set but `CMAKE_ASM*_COMPILER` is not, we copy the C or C++ compiler to use as the ASM compiler. In this case we still need to search for the ASM compiler in case the C or C++ compiler is not known as an absolute path. Also do not copy the compiler id setting and let the normal detection take place. The C compiler id may not exist if the language has not been enabled. Fixes: #18406
* | | | Merge topic 'update-libarchive'Brad King2018-09-2754-204/+1004
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6744e44970 Update CMake pre-cached values for libarchive 3.3.3 6a4b1006f9 Merge branch 'upstream-LibArchive' into update-libarchive 2aaed7a050 LibArchive 2018-09-03 (5fe69dd0) 710f37c47a libarchive: Update script to get 3.3.3 97e1213a88 Merge branch 'libarchive-libressl-2.7' into update-libarchive Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2417
| * | | | Update CMake pre-cached values for libarchive 3.3.3Brad King2018-09-261-0/+1
| | | | | | | | | | | | | | | | | | | | The ENABLE_LZ4 option was added.
| * | | | Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2018-09-2652-203/+1002
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-LibArchive: LibArchive 2018-09-03 (5fe69dd0)
| | * | | | LibArchive 2018-09-03 (5fe69dd0)LibArchive Upstream2018-09-2653-204/+1015
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libarchive/libarchive.git at commit 5fe69dd018745a88eecf1f7db40daf12d26f7ed0 (v3.3.3).
| * | | | | libarchive: Update script to get 3.3.3Brad King2018-09-261-1/+1
| | | | | |
| * | | | | Merge branch 'libarchive-libressl-2.7' into update-libarchiveBrad King2018-09-261-1/+2
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'release-3.12'Brad King2018-09-270-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'libarchive-libressl-2.7' into release-3.12Brad King2018-09-261-1/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | Merge-request: !2416
* | | | | | | | Merge topic 'libarchive-libressl-2.7'Brad King2018-09-271-1/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7e88e955b libarchive: Backport fix for build with LibreSSL 2.7 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2416
| * | | | | | | libarchive: Backport fix for build with LibreSSL 2.7Brad King2018-09-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport libarchive commit v3.3.3~16^2 (fix build with LibreSSL 2.7, 2018-04-01). LibreSSL 2.7 adds OpenSSL 1.1 API leading to conflicts on method names. Fixes: #18404
* | | | | | | | Merge topic 'FindMatlab-2018b'Brad King2018-09-272-0/+90
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62709beff8 FindMatlab: Add Matlab 2018a,b to version list 9a56ed3438 FindMatlab: Explicitly export mexFunction in MSVC 6c57f6b347 FindMatlab: Optionally allow linking to MatlabEngine and MatlabDataArray Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raffi Enficiaud <raffi.enficiaud@free.fr> Merge-request: !2407
| * | | | | | | | FindMatlab: Add Matlab 2018a,b to version listSean Warren2018-09-262-0/+5
| | | | | | | | |
| * | | | | | | | FindMatlab: Explicitly export mexFunction in MSVCSean Warren2018-09-262-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18391
| * | | | | | | | FindMatlab: Optionally allow linking to MatlabEngine and MatlabDataArraySean Warren2018-09-262-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17971
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-09-271-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge topic 'FindLua-names-per-dir'Brad King2018-09-261-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98dfdab19c FindLua: Search for all library names in each path Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Merge-request: !2412
| * | | | | | | | FindLua: Search for all library names in each pathBrad King2018-09-251-0/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the `NAMES_PER_DIR` option to our `find_library` call so that all names are considered in each path as we proceed through the search. This allows locally-built unversioned libraries to be found before versioned system libraries if they appear earlier in the set of paths to be searched. Suggested-by: Alan W. Irwin <irwin@beluga.phys.uvic.ca>
* | | | | | | | Merge topic 'FindGLUT-windows-debug'Brad King2018-09-261-9/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0da645d452 FindGLUT: Find debug/release variants on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2398
| * | | | | | | | FindGLUT: Find debug/release variants on WindowsKohányi Róbert2018-09-251-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Separate find_library calls to find Release and Debug libs. * Using select_library_configurations to properly populate required variables (similar to FindZLIB). * Setting Release and Debug specific properties (IMPORTED_CONFIGURATIONS_<CONFIG> and IMPORTED_LOCATION_<CONFIG>). * Falling back to setting just IMPORTED_LOCATION if GLUT_glut_LIBRARY_RELEASE or GLUT_glut_LIBRARY_DEBUG are not defined. This enables proper linking on Windows. Fixes: #17037
* | | | | | | | | Merge topic 'refactor-backtrace'Brad King2018-09-263-4/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c8187f687 clang-tidy: restore 'misc-noexcept-move-constructor' 6c2af9d302 cmListFileCache: Add missing assertion in backtrace Top method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2415
| * | | | | | | | clang-tidy: restore 'misc-noexcept-move-constructor'Brad King2018-09-262-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We disabled this in commit 1fe0d72eb6 (clang-tidy: exclude 'misc-noexcept-move-constructor', 2018-09-24) due to false positives. Restore it and use a NOLINT comment to suppress them instead.
| * | | | | | | | cmListFileCache: Add missing assertion in backtrace Top methodBrad King2018-09-262-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can only get the top of a stack that has at least one call. Update the method's comment accordingly.
* | | | | | | | | Merge topic 'link-directories'Craig Scott2018-09-2668-80/+898
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9717725f9 link_directories(): enhance capabilities b5915744eb LINK_DIRECTORIES target property: add policy for absolute paths check. a71caab46b LINK_DIRECTORIES: Add new properties and commands 5ca130e223 Refactoring: introduce function to check if a string is a generator expression Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2403
| * | | | | | | | | link_directories(): enhance capabilitiesMarc Chevrier2018-09-2513-10/+120
| | | | | | | | | |
| * | | | | | | | | LINK_DIRECTORIES target property: add policy for absolute paths check.Marc Chevrier2018-09-2519-4/+109
| | | | | | | | | |
| * | | | | | | | | LINK_DIRECTORIES: Add new properties and commandsMarc Chevrier2018-09-2541-62/+662
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These new capabilities enable to manage link directories Two new properties: * target properties: LINK_DIRECTORIES and INTERFACE_LINK_DIRECTORIES One new command * target_link_directories(): to populate target properties Fixes: #17215
| * | | | | | | | | Refactoring: introduce function to check if a string is a generator expressionMarc Chevrier2018-09-254-12/+15
| | | | | | | | | |
* | | | | | | | | | Merge topic 'dbgsym-packaging'Brad King2018-09-2611-405/+728
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8a3939aef CPack/Deb: Add ability to split out debug symbols into .ddeb package 42fbff45e4 CPack/Deb: Use CMAKE_COMMAND to set the environment 66ab24a4c5 Help: Fix typo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2399
| * | | | | | | | | | CPack/Deb: Add ability to split out debug symbols into .ddeb packageAndrew Fuller2018-09-2110-399/+722
| | | | | | | | | | |
| * | | | | | | | | | CPack/Deb: Use CMAKE_COMMAND to set the environmentAndrew Fuller2018-09-181-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Help: Fix typoAndrew Fuller2018-09-181-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'rel-linux64'Brad King2018-09-261-2/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 830d4760db Utilities/Release: Build with gcc 8.2 on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2414
| * | | | | | | | | | | Utilities/Release: Build with gcc 8.2 on LinuxBrad King2018-09-251-2/+5
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a binutils-2.31 to CMAKE_PREFIX_PATH in the environment so that tests that look for them with `find_program` can find a newer version. This is needed for the build id support in readelf.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-09-261-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge topic 'refactor-backtrace'Brad King2018-09-253-100/+91
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22aa6b67b4 cmListFileCache: Refactor cmListFileBacktrace internals 1fe0d72eb6 clang-tidy: exclude 'misc-noexcept-move-constructor' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2410
| * | | | | | | | | cmListFileCache: Refactor cmListFileBacktrace internalsBrad King2018-09-242-100/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace use of raw pointers and explicit reference counting with `std::shared_ptr<>`. Use a discriminated union to store either the bottom level or a call/file context in each heap-allocated entry. This avoids storing a copy of the bottom in every `cmListFileBacktrace` instance and shrinks the structure to a single `shared_ptr`.
| * | | | | | | | | clang-tidy: exclude 'misc-noexcept-move-constructor'Brad King2018-09-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our installation is producing false positives on move constructors and assignment operators that are clearly marked `noexcept`.