summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autogen: Evaluate compiler features for the same exectuable only onceSebastian Holtermann2019-05-225-48/+66
| | | | | | | To speed up the `AUTOGEN` configuration process, evaluate the compiler features only once. The feature evaluation result is stored in the new class `cmQtAutoGen::CompilerFeatures`, and the instance is shared by using `std::shared_ptr`.
* Merge topic 'string-param'Brad King2019-05-2111-57/+58
|\ | | | | | | | | | | | | 273257222e Source: change parameters to std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3340
| * Source: change parameters to std::stringVitaly Stakhovsky2019-05-1911-57/+58
| |
* | Merge topic 'FindPostgreSQL-config-support'Brad King2019-05-212-13/+51
|\ \ | | | | | | | | | | | | | | | | | | 368bcba28a FindPostgreSQL: Find debug lib, imported configs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3298
| * | FindPostgreSQL: Find debug lib, imported configsAndrei Lebedev2019-05-202-13/+51
| |/ | | | | | | | | | | | | | | * Add find_library calls for debug and release * Set imported configs for corresponding libraries in imported target * Set debug/optimized in PostgreSQL_LIBRARIES Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
* | Merge topic 'doc-ipo-check'Brad King2019-05-211-1/+3
|\ \ | | | | | | | | | | | | | | | | | | a59662bb5b Help: Add CheckIPOSupported link to INTERPROCEDURAL_OPTIMIZATION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3333
| * | Help: Add CheckIPOSupported link to INTERPROCEDURAL_OPTIMIZATIONRuslan Baratov2019-05-171-1/+3
| | |
* | | CMake Nightly Date StampKitware Robot2019-05-211-1/+1
| | |
* | | Merge topic 'makefiles_additional_clean_files'Brad King2019-05-207-132/+172
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f945c3e755 Tests: Extend MakeClean test to cover subdirectories without targets 1ded3599d6 Makefiles: Process ADDTIONAL_CLEAN_FILES dir prop at directory level 827da1119e Makefiles: Make build root targets "all", "clean" and "preinstall" recursive adc3459707 Makefiles: Avoid pointer repurposing 0d41b45cc9 Makefiles: Inline range loop range arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3338
| * | | Tests: Extend MakeClean test to cover subdirectories without targetsSebastian Holtermann2019-05-182-35/+64
| | | | | | | | | | | | | | | | | | | | This adds a subdirectory to the MakeClean test, in which files are added to the `ADDITIONAL_CLEAN_FILES` directory property, but which holds no targets.
| * | | Makefiles: Process ADDTIONAL_CLEAN_FILES dir prop at directory levelSebastian Holtermann2019-05-185-18/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the "Unix Makefiles" generator, the `ADDTIONAL_CLEAN_FILES` directory property was evaluated on a per target basis. This had two drawbacks: - per directory clean files were repeated in every target clean script - per directory clean files weren't removed in directories without targets (issue #8164) This patch moves the `ADDTIONAL_CLEAN_FILES` directory property processing from the target to the directory level clean target. Fixes: #8164 "ADDITIONAL_CLEAN_FILES directory property not respected if no target present in directory"
| * | | Makefiles: Make build root targets "all", "clean" and "preinstall" recursiveSebastian Holtermann2019-05-181-39/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the "Unix Makefiles" generator, the subdirectory targets "all", "clean" and "preinstall" in Makefile2 are recursive. In the build root directory, these targets aren't. Instead they're are added separately and additional dependencies are added on a per target basis. This is inconsistent and it complicates per directory commands, like a per directory clean command. This patch makes the "all", "clean" and "preinstall" targets in Makefile2 in the build root directory recursive, using the same algorithm that is already used for subdirectories. Some side effects are: - Makefile2 gets smaller and simpler - The main "all", "clean" and "preinstall" targets have recursive dependencies, instead of flat (depth of 1) ones.
| * | | Makefiles: Avoid pointer repurposingSebastian Holtermann2019-05-171-4/+4
| | | |
| * | | Makefiles: Inline range loop range argumentsSebastian Holtermann2019-05-172-36/+17
| | | |
* | | | Merge topic 'ninja-swift'Brad King2019-05-2027-156/+477
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9180ccf9a Tests: add a check for the Swift compiler d745551fb6 Help: add some initial documentation for Swift support 9a182c9e5b Auxiliary: update vim syntax highlighting e9b0063e8e Modules: add build rules for Swift Ninja support b6412e3e38 Ninja: add placeholders to support Swift build 7d7f31161d Ninja: add support for Swift's output-file-map.json d688c4c19d Swift: remove unnecessary unreleased Ninja infrastructure 0723582208 Swift: Detect compiler version ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3297
| * | | | Tests: add a check for the Swift compilerSaleem Abdulrasool2019-05-174-3/+74
| | | | | | | | | | | | | | | | | | | | This ensures that the tests only run when the Swift compiler is present.
| * | | | Help: add some initial documentation for Swift supportSaleem Abdulrasool2019-05-1611-0/+78
| | | | |
| * | | | Auxiliary: update vim syntax highlightingSaleem Abdulrasool2019-05-161-0/+6
| | | | | | | | | | | | | | | | | | | | Add new Swift keywords to the highlighting rules.
| * | | | Modules: add build rules for Swift Ninja supportSaleem Abdulrasool2019-05-164-24/+98
| | | | | | | | | | | | | | | | | | | | Add rules to support building Swift sources using Ninja.
| * | | | Ninja: add placeholders to support Swift buildSaleem Abdulrasool2019-05-164-1/+115
| | | | | | | | | | | | | | | | | | | | Add the placeholders needed to support compiling Swift code.
| * | | | Ninja: add support for Swift's output-file-map.jsonSaleem Abdulrasool2019-05-162-4/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an emitter for the Swift's output-map-file.json to emit the requisite support files for Swift compilation. This additionally prevents the build rules for the object file emission as well to properly support the Swift build semantics.
| * | | | Swift: remove unnecessary unreleased Ninja infrastructureSaleem Abdulrasool2019-05-164-126/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleans up the new options that were added to support Swift. This was not released, and the proper support approach that we settled upon does not require as much specialised support.
| * | | | Swift: Detect compiler versionBrad King2019-05-161-0/+24
| | | | |
| * | | | CMakeDetermineCompilerId: Make CMAKE_${lang}_COMPILER available earlierBrad King2019-05-161-7/+8
| | |/ / | |/| | | | | | | | | | | | | | If compiler id detection gave us the compiler tool, copy its value to the `CMAKE_${lang}_COMPILER` variable as early as possible.
* | | | Merge topic 'FindPNG-static-define'Brad King2019-05-201-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21c74faa1a FindPNG: Fix definitions on imported target Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Paolo Lammens <lammenspaolo@gmail.com> Merge-request: !3337
| * | | | FindPNG: Fix definitions on imported targetAxel Huebl2019-05-171-1/+4
| | |/ / | |/| | | | | | | | | | | | | | The `INTERFACE_COMPILE_DEFINITIONS` property should not have ``-D`` in its value.
* | | | Merge topic 'interface-library-export-properties'Brad King2019-05-204-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73a829e078 InterfaceLibrary: Whitelist EXPORT_PROPERTIES property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3336
| * | | | InterfaceLibrary: Whitelist EXPORT_PROPERTIES propertyBrad King2019-05-174-0/+12
| | | | | | | | | | | | | | | | | | | | Fixes: #19261
* | | | | CMake Nightly Date StampKitware Robot2019-05-201-1/+1
| |_|_|/ |/| | |
* | | | 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