summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'export-android-mk' into release-3.11v3.11.0-rc1Brad King2018-02-152-13/+17
|\ | | | | | | Merge-request: !1766
| * Android.mk: Fix export of static libraries with PRIVATE dependenciesBrad King2018-02-142-3/+6
| | | | | | | | | | | | | | | | The `LINK_ONLY` generator expression is used to represent private dependencies of static libraries in their `INTERFACE_LINK_LIBRARIES` property value. Fix evaluation of generator expressions during export to support the `LINK_ONLY` genex. Extend the RunCMake.AndroidMK test with a case for this.
| * Android.mk: Evaluate generator expressions up frontBrad King2018-02-141-12/+13
| | | | | | | | | | | | When exporting `INTERFACE_LINK_LIBRARIES`, we must evaluate generator expressions first, before expanding the `;` list, in case they contain or generate semicolons.
* | Merge branch 'autogen-write-on-change-only' into release-3.11Brad King2018-02-131-34/+12
|\ \ | | | | | | | | | Merge-request: !1753
| * | Autogen: Overwrite info files when changed onlySebastian Holtermann2018-02-061-34/+12
| |/ | | | | | | | | | | Check if the content of the AUTOMOC/UIC/RCC info file will change before overwriting it. This avoids unnecessary AUTORCC rebuilds when AUTORCC unrelated CMake settings change.
* | Merge branch 'FindImageMagick-FixFor7.0.x' into release-3.11Brad King2018-02-131-2/+2
|\ \ | | | | | | | | | Merge-request: !1754
| * | FindImageMagick: Add 7.0 library namesRoman Wüger2018-02-061-2/+2
| |/ | | | | | | | | For ImageMagick 7.0.x we need to consider `CORE_RL_MagickWand_` and `CORE_RL_MagickCore_`.
* | Merge branch '17711-reset-xcode-target-var' into release-3.11Brad King2018-02-131-0/+1
|\ \ | | | | | | | | | Merge-request: !1757
| * | cmGlobalXCodeGenerator: Properly initialize TARGETS variableGregor Jasny2018-02-131-0/+1
| |/ | | | | | | Fixes: #17711
* | CMake 3.11.0-rc1 version updateBrad King2018-02-052-4/+4
| |
* | Help: Drop development topic notes to prepare releaseBrad King2018-02-052-9/+0
|/ | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* Merge topic 'doc-3.11-relnotes'Brad King2018-02-0540-308/+279
|\ | | | | | | | | | | | | | | acbbccf7 Help: Organize and revise 3.11 release notes 22ac06ed Help: Consolidate 3.11 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1751
| * Help: Organize and revise 3.11 release notesBrad King2018-02-051-159/+197
| | | | | | | | | | Add section headers similar to the 3.10 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * Help: Consolidate 3.11 release notesBrad King2018-02-0540-308/+241
|/ | | | | Run the `Utilities/Release/consolidate-relnotes.bash` script to move notes from `Help/release/dev/*` into `Help/release/3.11.rst`.
* Merge topic 'bootstrap-try-clang'Brad King2018-02-051-2/+2
|\ | | | | | | | | | | | | 04167e39 bootstrap: Add Clang to known compiler candidates Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1749
| * bootstrap: Add Clang to known compiler candidatesAxel Huebl2018-02-051-2/+2
| | | | | | | | | | | | Add `clang` and `clang++` after the corresponding `gcc` and `g++` candidates. Otherwise it is not tried on platforms where we do not enumerate the toolchain pair candidates.
* | Merge topic 'fix_help_cmake_parse_arguments'Brad King2018-02-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | b95eda9b Help: Fix code example in cmake_parse_arguments.rst Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1747
| * | Help: Fix code example in cmake_parse_arguments.rstKai Wolf2018-02-041-1/+1
| | |
* | | Merge topic 'autogen-improve-multi-config'Brad King2018-02-0510-510/+421
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a8ee7406 Autogen: Improved multi-config include scheme Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1735
| * | | Autogen: Improved multi-config include schemeSebastian Holtermann2018-02-0210-510/+421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For multi configuration generators AUTOMOC generates the moc files that are included in `mocs_compilation.cpp` in `AUTOGEN_BUILD_DIR/include_$<CONFIG>/`. By doing so each configuration reads different moc files when compiling `mocs_compilation.cpp`. Since we do not (need to) rewrite `mocs_compilation.cpp` on a configuration change anymore, the files also does not need to be recompiled anymore. Not having to rewrite and recompile `mocs_compilation.cpp` on a configuration change anymore was the main objective of this patch. In a similar fashion AUTORCC generates a `qrc_BASE_CMAKE.cpp` file below `AUTOGEN_BUILD_DIR/include_$<CONFIG>/` and `qrc_BASE.cpp` becomes a mere wrapper that includes this actuall rcc output file (when using multi configuration generators). The template files `Modules/AutoRccInfo.cmake.in` and `Modules/AutogenInfo.cmake.in` were removed in favor of writing the info `.cmake` files manually. Closes #17230
* | | | Merge topic 'autogen-documentation'Brad King2018-02-052-11/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4ffbb79 Autogen: Documentation: Update for AUTORCC changes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1744
| * | | | Autogen: Documentation: Update for AUTORCC changesSebastian Holtermann2018-02-032-11/+13
| | | | |
* | | | | Merge topic 'vs-static-ConvertToWindowsSlash'Brad King2018-02-052-51/+52
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d148d6d cmVisualStudio10TargetGenerator: Limit scope of ConvertToWindowsSlash() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1741
| * | | | | cmVisualStudio10TargetGenerator: Limit scope of ConvertToWindowsSlash()Vitaly Stakhovsky2018-02-022-51/+52
| | |/ / / | |/| | | | | | | | | | | | | It is no longer used outside this class, so its scope can be limited to file.
* | | | | CMake Nightly Date StampKitware Robot2018-02-051-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2018-02-041-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-02-031-1/+1
| |/ / |/| |
* | | Merge topic 'UseSWIG-fix-regression'Brad King2018-02-021-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bc3697fa UseSWIG: Restore support for like-named .i files in different modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1734
| * | | UseSWIG: Restore support for like-named .i files in different modulesMarc Chevrier2018-02-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic added by commit 2ee10119ea (swig: fix incremental build in case of removed interface files, 2017-11-06). Name the extra targets added for Makefile generators using both the module name and .i base name to avoid collisions across modules. Also make sure the extra targets added for all .i files in a module are added as dependencies instead of just the last one. Fixes: #17704
* | | | Merge topic 'simplify-ccg-converter'Brad King2018-02-021-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df1693bd cmCustomCommandGenerator: Simplify cmOutputConverter access Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1738
| * | | | cmCustomCommandGenerator: Simplify cmOutputConverter accessBrad King2018-02-011-3/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc1~480^2~3 (cmCustomCommandGenerator: Port to cmOutputConverter, 2015-06-04), cmCustomCommandGenerator's access to the local generator was removed so it needed to construct its own cmOutputConverter instance. Access to the local generator was then restored by commit v3.4.0-rc1~285^2~21 (cmCustomCommandGenerator: Require cmLocalGenerator in API, 2015-07-25), so now we can use its cmOutputConverter base class methods directly.
* | | | Merge topic 'test-cuda-missing-check'Brad King2018-02-021-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8285aa9e Tests: Add missing error check in CudaOnly.GPUDebugFlag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !1739
| * | | | Tests: Add missing error check in CudaOnly.GPUDebugFlagBrad King2018-02-011-0/+5
| |/ / / | | | | | | | | | | | | If `cudaMallocManaged` fails then later use of `has_debug` is not valid.
* | | | Merge topic 'ninja-unused-device-link'Brad King2018-02-021-28/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20676cba Ninja: Remove unused device link line code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1737
| * | | | Ninja: Remove unused device link line codeBrad King2018-02-011-28/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `PRE_LINK` and `POST_BUILD` variables. They are not referenced by `WriteDeviceLinkRule`. Remove the `byproducts` local variable from `WriteDeviceLinkStatement` and all the code populating it. We never used the result.
* | | | Merge topic 'update-kwsys'Brad King2018-02-023-98/+89
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | be46f9fb Merge branch 'upstream-KWSys' into update-kwsys 854feacc KWSys 2018-02-01 (04fcc449) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1736
| * | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-02-013-98/+89
| |\ \ \ | | |/ / | |/| | | | | | | | | | * upstream-KWSys: KWSys 2018-02-01 (04fcc449)
| | * | KWSys 2018-02-01 (04fcc449)KWSys Upstream2018-02-013-98/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 04fcc449646eb2ff3d701986946a1db60b2161b7 (master). Upstream Shortlog ----------------- Ben Boeckel (11): ba270398 SystemToolsAppendComponents: move strings when building components cfd0f1e6 JoinPath: push back as a character 6770cb3e GetFilenameName: optionally don't search for \ on non-Windows 22b189b0 ConvertToUnixSlashes: remove escaped space logic 342d69a4 ConvertToUnixSlashes: short-circuit on hasDoubleSlash 5dd87350 ConvertToUnixSlashes: remove pos1 3b46b7c0 ConvertToUnixSlashes: bail early on empty paths 55d1d6ab CollapseFullPath: reserve space for components 68807138 CollapseFullPath: prefer .empty() to .length() == 0 71a6de42 CollapseFullPath: refactor the overloads to share implementations 318550c7 CheckCollapsePath: add more test cases
* | | | CMake Nightly Date StampKitware Robot2018-02-021-1/+1
|/ / /
* | | Merge topic 'msvc-doc-fix'Brad King2018-02-012-3/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | efe22af2 Help: Clarify MSVC and MSVC_VERSION variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1732
| * | | Help: Clarify MSVC and MSVC_VERSION variablesChristian Pfeiffer2018-02-012-3/+6
| | | | | | | | | | | | | | | | | | | | The current documentation doesn't clarify that compilers simulating Visual C++ will also have these variables set.
* | | | Merge topic 'std-string-apis'Brad King2018-02-01120-506/+470
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 653b8946 Reduce raw string pointers usage. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1729
| * | | | Reduce raw string pointers usage.Pavel Solodovnikov2018-01-31120-507/+471
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Change some functions to take `std::string` instead of `const char*` in the following classes: `cmMakeFile`, `cmake`, `cmCoreTryCompile`, `cmSystemTools`, `cmState`, `cmLocalGenerator` and a few others. * Greatly reduce using of `const char*` overloads for `cmSystemTools::MakeDirectory` and `cmSystemTools::RelativePath`. * Remove many redundant `c_str()` conversions throughout the code.
* | | | | Merge topic 'UseSWIG-doc-clarify'Brad King2018-02-011-52/+64
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b844a414 UseSWIG: Clarify documentation of SWIG_OUTFILE_DIR 315b0927 UseSWIG: Improve documentation markup ce130c7a UseSWIG: Convert docs to a bracket comment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1733
| * | | | | UseSWIG: Clarify documentation of SWIG_OUTFILE_DIRNoel Eck2018-01-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `SWIG_OUTFILE_DIR` variable provides the option to specify an output directory location. This commit removes portion stating that this is equal to the `swig -o` option since it does not set the output filename. Fixes: #17703 Signed-off-by: Noel Eck <noel.eck@intel.com>
| * | | | | UseSWIG: Improve documentation markupBrad King2018-01-311-31/+42
| | | | | |
| * | | | | UseSWIG: Convert docs to a bracket commentBrad King2018-01-311-52/+53
| | |/ / / | |/| | |
* | | | | Merge topic 'findmpi-linker-parsing-enh'Brad King2018-02-011-92/+281
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0def3604 FindMPI: Discard IMPI boilerplate text 9ecbec5e FindMPI: Support for IMPI's compiler check 76755367 FindMPI: Set up environment variables for wrapper e7c0298d FindMPI: Retain unused link paths 8cddc899 FindMPI: Use more CMake variables 8b79107a FindMPI: Improve link information parsing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1694
| * | | | | FindMPI: Discard IMPI boilerplate textChristian Pfeiffer2018-01-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel MPI on Windows prefixes all outputs with some boilerplate copyright text. By discarding it, we should prevent any potential clashes with our regex parsing.
| * | | | | FindMPI: Support for IMPI's compiler checkChristian Pfeiffer2018-01-311-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel MPI has an optional feature to check compatibility with the compiler, given by I_MPI_CHECK_COMPILER. This commit adds support for executing that check.
generated by cgit v0.12 at 2024-12-25 17:29:55 (GMT)