summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Source: change parameters to std::stringVitaly Stakhovsky2019-05-1911-57/+58
|
* CMake Nightly Date StampKitware Robot2019-05-191-1/+1
|
* Merge topic 'bracket-comment-doc-clarification'Craig Scott2019-05-181-3/+3
|\ | | | | | | | | | | | | | | | | 124564504a Help: Clarify that bracket comments start with bracket open Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Acked-by: Ben McMorran <ben.mcmorran@gmail.com> Merge-request: !3331
| * Help: Clarify that bracket comments start with bracket openKyle Edwards2019-05-161-3/+3
| | | | | | | | Fixes: #19264
* | Merge topic 'file-install-follow-symlink-chain'Marc Chevrier2019-05-186-7/+268
|\ \ | | | | | | | | | | | | | | | | | | | | | e3ff7ced63 file(INSTALL): Add FOLLOW_SYMLINK_CHAIN argument Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !3332
| * | file(INSTALL): Add FOLLOW_SYMLINK_CHAIN argumentKyle Edwards2019-05-166-7/+268
| |/
* | CMake Nightly Date StampKitware Robot2019-05-181-1/+1
| |
* | Merge topic 'findblas_mklroot_bla_vendor'Brad King2019-05-171-9/+8
|\ \ | | | | | | | | | | | | | | | | | | 89ab54c112 FindBLAS: Choose MKL arch based on BLA_VENDOR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3330
| * | FindBLAS: Choose MKL arch based on BLA_VENDORJakub Benda2019-05-161-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently, FindBLAS has been extended with additional library search path based on the environment variable MKLROOT. However, the choice of the Intel MKL architecture (IA-32 vs Intel64) was based on unrelated (and possibly undefined) size of integer. This commit changes the selection of the Intel MKL architecture to instead consider the variable BLA_VENDOR, if available. So, if the environment variable MKLROOT is defined and BLA_VENDOR=Intel10_32, then $ENV{MKLROOT}/lib/ia32_<OS> will be added to the search path (OS = lin, win, or mac). Similarly, if MKLROOT is defined and BLA_VENDOR=Intel10_64lp or BLA_VENDOR=Intel10_64ilp, then the path $ENV{MKLROOT}/intel64_<OS> will be used. If either MKLROOT or BLA_VENDOR is undefined, no additional search path on top of LD_LIBRARY_PATH / DYLD_LIBRARY_PATH / LIB is be added.
* | | Merge topic 'autogen_ninja_clean'Brad King2019-05-173-11/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93ee7dd044 Autogen: Update documentation for ADDITIONAL_CLEAN_FILES 4b4fd99f41 Autogen: Use ADDITIONAL_CLEAN_FILES target property for file cleaning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3327
| * | | Autogen: Update documentation for ADDITIONAL_CLEAN_FILESSebastian Holtermann2019-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | Update the AUTOGEN documentation for the use of `ADDITIONAL_CLEAN_FILES` instead of `ADDITIONAL_MAKE_CLEAN_FILES`.
| * | | Autogen: Use ADDITIONAL_CLEAN_FILES target property for file cleaningSebastian Holtermann2019-05-152-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ADDITIONAL_CLEAN_FILES` target property works on multiple generators to remove addition files at the clean target. In `AUTOGEN` use it instead of the deprecated and limited `ADDITIONAL_MAKE_CLEAN_FILES` directory property to remove `AUTOGEN` generated files. Fixes: #17074 "Autogen: clean target with ninja generator doesn’t clean autogen files"
* | | | Merge topic 'use_additional_clean_files'Brad King2019-05-176-30/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eda3963615 UseSWIG: Use ADDITIONAL_CLEAN_FILES for cleaning 8c47be28cc UseJava: Use ADDITIONAL_CLEAN_FILES for cleaning ac86c02d1b UseEcos: Use ADDITIONAL_CLEAN_FILES for cleaning 2532e00339 FindDoxygen: Use ADDITIONAL_CLEAN_FILES for cleaning 4edc0ef359 Test: Improve WarnUnusedCliUnused to run on all generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3328
| * | | | UseSWIG: Use ADDITIONAL_CLEAN_FILES for cleaningSebastian Holtermann2019-05-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Replace use of the deprecated `ADDITIONAL_MAKE_CLEAN_FILES` directory property with the new `ADDITIONAL_CLEAN_FILES` directory property.
| * | | | UseJava: Use ADDITIONAL_CLEAN_FILES for cleaningSebastian Holtermann2019-05-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Replace use of the deprecated `ADDITIONAL_MAKE_CLEAN_FILES` directory property with the new `ADDITIONAL_CLEAN_FILES` directory property.
| * | | | UseEcos: Use ADDITIONAL_CLEAN_FILES for cleaningSebastian Holtermann2019-05-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Replace use of the deprecated `ADDITIONAL_MAKE_CLEAN_FILES` directory property with the new `ADDITIONAL_CLEAN_FILES` directory property.
| * | | | FindDoxygen: Use ADDITIONAL_CLEAN_FILES for cleaningSebastian Holtermann2019-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Replace use of the deprecated `ADDITIONAL_MAKE_CLEAN_FILES` directory property with the new `ADDITIONAL_CLEAN_FILES` directory property.
| * | | | Test: Improve WarnUnusedCliUnused to run on all generatorsSebastian Holtermann2019-05-152-22/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the WarnUnusedCliUnused test, the whole CMakeCache.txt was removed in the clean stage to trigger the same CMake warning in re-builds. This technique worked only in the Makefile generators and the test was limited to these. Now only the variable of interest is removed from the cache by using a `unset(UNUSED_CLI_VARIABLE CACHE)` statement in the CMakeLists.txt file. This makes the WarnUnusedCliUnused test run on all generators
* | | | Merge topic 'offer_compiler_lang_generator_expression'Brad King2019-05-1730-11/+222
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e214abdaab Genex: Add COMPILE_LANG_AND_ID generator expression f84ed796a2 Docs: Generator-expressions remove usage of `CMake-id` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3300
| * | | | Genex: Add COMPILE_LANG_AND_ID generator expressionRobert Maynard2019-05-1430-1/+212
| | | | |
| * | | | Docs: Generator-expressions remove usage of `CMake-id`Robert Maynard2019-05-131-10/+10
| | | | |
* | | | | Merge topic 'string-cleanup'Brad King2019-05-1718-91/+87
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23e8364aed Source: std::string related cleanup Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Sebastian Holtermann <sebholt@web.de> Merge-request: !3324
| * | | | | Source: std::string related cleanupVitaly Stakhovsky2019-05-1518-91/+87
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-05-171-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'armclang'Brad King2019-05-1615-1/+126
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b0abaac31 ARMClang: Add support for Clang-based ARM compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3315
| * | | | | ARMClang: Add support for Clang-based ARM compilerJohan Stridkvist2019-05-1415-1/+126
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18215
* | | | | | Merge topic 'sunpro-supports-cxx14-release-note'Brad King2019-05-161-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb39f09dc2 Help: Add release note that SunPro supports C++14 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3329
| * | | | | | Help: Add release note that SunPro supports C++14Robert Maynard2019-05-151-0/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge topic 'FindBoost-allow-root'Brad King2019-05-161-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e1e3935f5d FindBoost: Remove obsolete diagnostic message about Boost_ROOT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3323
| * | | | | | FindBoost: Remove obsolete diagnostic message about Boost_ROOTDennis Klein2019-05-151-1/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake 3.12 introduced <package>_ROOT CMake and environment variables to be valid hints to find_package(<package>). Defining Boost_ROOT is no longer wrong if CMP0074 is set to NEW. Fixes #18810
* | | | | | Merge topic 'update-kwsys'Brad King2019-05-162-20/+83
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23b3ca5e1f Merge branch 'upstream-KWSys' into update-kwsys 49f8351a18 KWSys 2019-05-15 (dea11658) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3325
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-05-152-20/+83
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-05-15 (dea11658)
| | * | | | | KWSys 2019-05-15 (dea11658)KWSys Upstream2019-05-152-20/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit dea11658266eaca24c017670b1b6c6e817afe5be (master). Upstream Shortlog ----------------- Fan Jinke (1): 93352b24 SystemInformation: Add Hygon Dhyana Support Ken Martin (1): 43c6e2fd SystemInformation: Implement backtrace support on Windows
* | | | | | | CMake Nightly Date StampKitware Robot2019-05-161-1/+1
| | | | | | |
* | | | | | | Merge topic 'msvc-jmc'Brad King2019-05-1513-1/+137
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a9ff9703e MSVC: Add support for /JMC (Just My Code) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3121
| * | | | | | MSVC: Add support for /JMC (Just My Code)Luca Cappa2019-05-1413-1/+137
| | | | | | |
* | | | | | | Merge topic 'additional_clean_files'Brad King2019-05-1521-77/+370
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5bf369ec6 Release notes: Add release notes for ADDITIONAL_CLEAN_FILES properties 4e2ce0a67a Doc: Update and deprecate ADDITIONAL_MAKE_CLEAN_FILES directory property 338994d65d Doc: Add documentation for ADDITIONAL_CLEAN_FILES properties c11f089d73 Tests: Extend MakeClean test to cover ADDITIONAL_CLEAN_FILES 012d599e26 Ninja: Add support for ADDITIONAL_CLEAN_FILES target property 890a1b9dc3 Ninja: Add support for ADDITIONAL_CLEAN_FILES directory property 7b23001f20 Ninja: Add support for additional clean files d745df4b01 Makefiles: Add support for ADDITIONAL_CLEAN_FILES target property ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3318
| * | | | | | | Release notes: Add release notes for ADDITIONAL_CLEAN_FILES propertiesSebastian Holtermann2019-05-141-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds release notes for the `ADDITIONAL_CLEAN_FILES` target and directory properties. It also adds a deprecation release note for the `ADDITIONAL_MAKE_CLEAN_FILES` directory property.
| * | | | | | | Doc: Update and deprecate ADDITIONAL_MAKE_CLEAN_FILES directory propertySebastian Holtermann2019-05-141-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extends the :prop_dir:`ADDITIONAL_MAKE_CLEAN_FILES` directory property documentation and marks it as deprecated. The new directory property :prop_dir:`ADDITIONAL_CLEAN_FILES` should be used instead.
| * | | | | | | Doc: Add documentation for ADDITIONAL_CLEAN_FILES propertiesSebastian Holtermann2019-05-143-0/+34
| | | | | | | |
| * | | | | | | Tests: Extend MakeClean test to cover ADDITIONAL_CLEAN_FILESSebastian Holtermann2019-05-143-30/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extends the MakeClean test to cover the - ADDITIONAL_CLEAN_FILES directory property and the - ADDITIONAL_CLEAN_FILES target property as well.
| * | | | | | | Ninja: Add support for ADDITIONAL_CLEAN_FILES target propertySebastian Holtermann2019-05-143-0/+29
| | | | | | | |
| * | | | | | | Ninja: Add support for ADDITIONAL_CLEAN_FILES directory propertySebastian Holtermann2019-05-142-0/+27
| | | | | | | |
| * | | | | | | Ninja: Add support for additional clean filesSebastian Holtermann2019-05-142-7/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional clean files for the Ninja generator can be registered via the new method `cmGlobalNinjaGenerator::AddAdditionalCleanFile`. If there are additional clean files, a new rule `CLEAN_ADDITIONAL` and a new build target `CMakeFiles/clean.additional` get generated. The `clean` target will depend on `CMakeFiles/clean.additional`, if the target exists.
| * | | | | | | Makefiles: Add support for ADDITIONAL_CLEAN_FILES target propertySebastian Holtermann2019-05-141-0/+12
| | | | | | | |
| * | | | | | | Makefiles: Add support for ADDITIONAL_CLEAN_FILES directory propertySebastian Holtermann2019-05-141-0/+12
| | | | | | | |
| * | | | | | | Makefiles: Move ADDITIONAL_MAKE_CLEAN_FILES evaluation to lambdaSebastian Holtermann2019-05-141-10/+16
| | | | | | | |
| * | | | | | | Makefiles: Sort clean files by using a std::set<std::string> containerSebastian Holtermann2019-05-146-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using a `std::set<std::string>` container instead of a `std::vector<std::string>` container, the clean files list becomes sorted and unique. The clean target in Makefiles beomes nicer and better readable this way. Also double clean entries won't appear anymore.
* | | | | | | | Merge topic 'ninja-pool-custom-command'Brad King2019-05-1521-28/+144
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f76961de8 Support job pools in custom commands and targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3308
| * | | | | | | | Support job pools in custom commands and targetsRosen Matev2019-05-1421-28/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a way for custom commands and targets to set the pool variable of the ninja build statement. Setting `JOB_POOL` is not compatible with `USES_TERMINAL`, which implies the `console` pool. The option is silently ignored with other generators. Closes: #18483