summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'string-join'Brad King2018-02-2012-2/+75
|\ | | | | | | | | | | | | | | 689eeb67 string: Add JOIN subcommand Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com> Merge-request: !1762
| * string: Add JOIN subcommandAlex Turbov2018-02-1612-2/+75
| | | | | | | | | | This is just like CONCAT but accepts a glue string to put between each value. `JOIN ""` is equivalent to `CONCAT`.
* | Merge topic 'ninja-cmake-deps'Brad King2018-02-201-1/+7
|\ \ | | | | | | | | | | | | | | | | | | ed000d7d Ninja: Don't add custom command outputs to phony rule for CMake inputs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1768
| * | Ninja: Don't add custom command outputs to phony rule for CMake inputsPatrick Stewart2018-02-151-1/+7
| | |
* | | Merge topic 'msvc-parallel-build-17696'Brad King2018-02-201-0/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a1dee224 CMake: Enable /MP for MSVC toolchain Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1718
| * | | CMake: Enable /MP for MSVC toolchainRobert Dailey2018-02-151-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new cache option named `CMake_MSVC_PARALLEL` is now available that can be used to control the usage of [`/MP`][1] to the MSVC compiler. This enables parallelized builds on a per-translation unit basis. To enable `/MP`, specify value `ON` to the option. Using an integral non-zero value will control the specific number of threads used with the `/MP` option, as opposed to letting the toolchain decide for you. Fixes #17696 [1]: https://docs.microsoft.com/en-us/cpp/build/reference/mp-build-with-multiple-processes
* | | | Merge topic 'findzlib-folder-priority'Brad King2018-02-201-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c01eede8 FindZLIB: Search names per directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1769
| * | | | FindZLIB: Search names per directoryStefan Hacker2018-02-151-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindZLIB accepts various names for zlib (e.g. "z", "zlib", ...) in various search locations. Before this patch zlib ignored the priority implied by the search locations and instead prioritized based on the library name. Consequently ensuring the pick of a zlib from e.g. a CMAKE_PREFIX_PATH was not possible if it didn't have the highest priority name ("z"). This unexpected behavior led to bugs in third party projects (e.g. https://github.com/Microsoft/vcpkg/issues/1939). A common way to encounter the issue in the wild is on Windows with the popular Anaconda python distribution which puts a "z.lib" in a lib/ subdirectory reachable from a bin/ path in PATH. From then on cmake will always pick up this library instead of the one intended by the user. This patch adds the NAMES_PER_DIR option to the find_library calls made by FindZLIB making it search each directory for all names before considering lower priority directory names resolving these issues.
* | | | Merge topic 'CheckCSourceRuns-log-run-output'Brad King2018-02-201-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b25b39ad CheckCSourceRuns: Teach CHECK_C_SOURCE_RUNS to log run output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1772
| * | | | CheckCSourceRuns: Teach CHECK_C_SOURCE_RUNS to log run outputEdward Z. Yang2018-02-161-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Edward Z. Yang <ezyang@fb.com> Fixes: #17745
* | | | | Merge topic 'follow-up-misc-typos'Brad King2018-02-209-9/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 287e7a17 Maint: misc. typos Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1771
| * | | | | Maint: misc. typosluz.paz2018-02-169-9/+9
| | |/ / / | |/| | | | | | | | | | | | | Found via `codespell`
* | | | | Merge topic 'help_fixup'Brad King2018-02-202-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1667e244 Help: Fix command references in CMAKE_NETRC* variable documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1770
| * | | | | Help: Fix command references in CMAKE_NETRC* variable documentationShane Parris2018-02-162-2/+2
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-02-201-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-02-191-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-02-181-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-02-171-1/+1
| | | | | |
* | | | | | Merge topic 'file_cmd_touch'Brad King2018-02-1618-9/+102
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e78e24f6 Replaces execute_process calls to touch files with file(TOUCH) calls 602988e1 Adds file(TOUCH) and file(TOUCH_NOCREATE) sub-commands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1705
| * | | | | | Replaces execute_process calls to touch files with file(TOUCH) callsShane Parris2018-02-153-7/+4
| | | | | | |
| * | | | | | Adds file(TOUCH) and file(TOUCH_NOCREATE) sub-commandsShane Parris2018-02-1515-2/+98
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'genex-IN_LIST-operator'Brad King2018-02-165-0/+43
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5089f560 Genex: Add IN_LIST logical operator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1724
| * | | | | Genex: Add IN_LIST logical operatorMarc Chevrier2018-02-075-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | Implements #17679
* | | | | | CMake Nightly Date StampKitware Robot2018-02-161-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'enhanced-UseSWIG-Module'Brad King2018-02-1523-214/+596
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0bef9eb4 UseSWIG: modernize module d6048bd1 UseSWIG: Re-work test framework Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1707
| * | | | | UseSWIG: modernize moduleMarc Chevrier2018-02-1410-156/+489
| | | | | |
| * | | | | UseSWIG: Re-work test frameworkMarc Chevrier2018-02-1418-70/+119
| | | | | |
* | | | | | Merge topic 'directory-property-TESTS'Brad King2018-02-157-1/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b513a879 Tests management: add TESTS directory property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1748
| * | | | | | Tests management: add TESTS directory propertyMarc Chevrier2018-02-087-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements: #17680
* | | | | | | Merge branch 'release-3.11'Brad King2018-02-150-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'export-android-mk' into release-3.11v3.11.0-rc1Brad King2018-02-152-13/+17
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1766
* | \ \ \ \ \ \ \ Merge topic 'export-android-mk'Brad King2018-02-152-13/+17
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6d68766 Android.mk: Fix export of static libraries with PRIVATE dependencies 56e16885 Android.mk: Evaluate generator expressions up front Acked-by: Kitware Robot <kwrobot@kitware.com> 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.
* | | | | | | CMake Nightly Date StampKitware Robot2018-02-151-1/+1
| | | | | | |
* | | | | | | Merge topic 'ninja-cmd'Brad King2018-02-147-9/+121
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22e8b3af Ninja: Generate scripts for long custom command sequences Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1604
| * | | | | | | Ninja: Generate scripts for long custom command sequencesRoger Leigh2018-02-067-9/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja runs just one command line for every build statement, so the Ninja generator needs to `&&`-chain multiple commands together into one long string. For long custom command sequences this can exceed the maximum command-line length for the operating system. In such cases, write the commands out to a script instead, and then run the script from Ninja's one command line. Co-Author: Brad King <brad.king@kitware.com> Fixes: #15612
* | | | | | | | Merge topic 'help_string_MAKE_C_IDENTIFIER'Brad King2018-02-142-8/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a71ab3be Help: Expand string(MAKE_C_IDENTIFIER) docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1760
| * | | | | | | | Help: Expand string(MAKE_C_IDENTIFIER) docsCraig Scott2018-02-112-8/+14
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MAKE_C_IDENTIFIER subcommand was also buried in the docs for the TIMESTAMP subcommand, so it has been pulled out to its own subheading.
* | | | | | | | Merge topic 'const-members'Brad King2018-02-142-66/+40
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b721b9a3 cmVisualStudio10TargetGenerator: Make some data members const; simplify Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1750
| * | | | | | | cmVisualStudio10TargetGenerator: Make some data members const; simplifyVitaly Stakhovsky2018-02-062-66/+40
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-02-141-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'more-misc-typos'Brad King2018-02-139-16/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 193082a3 MAINT: Misc. typos Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1758
| * | | | | | | | MAINT: Misc. typosluz.paz2018-02-139-16/+16
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Found via `codespell -q 3 -I ../cmake-whitelist.txt`.
* | | | | | | | Merge branch 'release-3.11'Brad King2018-02-130-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'autogen-write-on-change-only' into release-3.11Brad King2018-02-131-34/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1753
| * \ \ \ \ \ \ \ Merge branch 'FindImageMagick-FixFor7.0.x' into release-3.11Brad King2018-02-131-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1754
| * \ \ \ \ \ \ \ \ Merge branch '17711-reset-xcode-target-var' into release-3.11Brad King2018-02-131-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1757
* | \ \ \ \ \ \ \ \ \ Merge topic '17711-reset-xcode-target-var'Brad King2018-02-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4349393d cmGlobalXCodeGenerator: Properly initialize TARGETS variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1757
| * | | | | | | | | | cmGlobalXCodeGenerator: Properly initialize TARGETS variableGregor Jasny2018-02-131-0/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17711
generated by cgit v0.12 at 2025-09-10 14:54:53 (GMT)