Commit Graph

38819 Commits

Author SHA1 Message Date
Brad King fef001884f Merge topic 'FindLua-tolerate-var'
6cced787 FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1778
2018-02-21 10:44:08 -05:00
Brad King fcae625f48 Merge topic 'FindwxWidget/fix-eating-minusL-in-path'
67db3ff9 Fix eating "-L" in path names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1775
2018-02-21 10:43:40 -05:00
Brad King 283562624c Merge topic 'find-linker'
e936b6bb CMakeFindBinUtils: Find linker in PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1720
2018-02-21 10:43:09 -05:00
xoviat e936b6bb5a CMakeFindBinUtils: Find linker in PATH
Fixes: #17693
2018-02-21 10:42:15 -05:00
Kitware Robot 4e6f94d49c CMake Nightly Date Stamp 2018-02-21 00:01:09 -05:00
Frank Benkstein 6cced78725 FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variable
We use `LUA_INCLUDE_PREFIX` for the result of an internal `find_path`
call and unset the cache entry before each use.  Unset a plain variable
of this name too in case it was set by project code.  Otherwise the
`find_path` call may be skipped and the wrong value used, leading to
errors.
2018-02-20 16:13:45 -05:00
Brad King b89252689c Merge branch 'release-3.11' 2018-02-20 11:55:46 -05:00
Brad King a8d182fbbf Merge topic 'ti-depfile-flag-fix'
cab9af7e Compiler/TI: Fix depfile generation for C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1774
2018-02-20 11:54:15 -05:00
Brad King 82c23d6afc Merge branch 'ti-depfile-flag-fix' into release-3.11
Merge-request: !1774
2018-02-20 11:52:30 -05:00
Grzegorz Dobinski cab9af7e97 Compiler/TI: Fix depfile generation for C++
In commit v3.11.0-rc1~466^2 (Compiler/TI: Add support for depfile
generation for Ninja, 2017-10-16) the flag for C++ was added in a
variable with a typo in its name.  Fix the spelling.

Issue: #17360
2018-02-20 11:52:11 -05:00
Brad King 846a4dd118 Merge topic 'string-join'
689eeb67 string: Add JOIN subcommand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com>
Merge-request: !1762
2018-02-20 11:47:51 -05:00
Brad King 8a99ccc5ed Merge topic 'ninja-cmake-deps'
ed000d7d Ninja: Don't add custom command outputs to phony rule for CMake inputs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1768
2018-02-20 11:46:21 -05:00
Brad King 10f39ca7f7 Merge topic 'msvc-parallel-build-17696'
a1dee224 CMake: Enable /MP for MSVC toolchain

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1718
2018-02-20 11:44:59 -05:00
Brad King 3bc3762c7c Merge topic 'findzlib-folder-priority'
c01eede8 FindZLIB: Search names per directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1769
2018-02-20 11:42:23 -05:00
Brad King 1fbd5f4a7e Merge topic 'CheckCSourceRuns-log-run-output'
b25b39ad CheckCSourceRuns: Teach CHECK_C_SOURCE_RUNS to log run output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1772
2018-02-20 11:41:50 -05:00
Brad King 088c1876ef Merge topic 'follow-up-misc-typos'
287e7a17 Maint: misc. typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1771
2018-02-20 11:41:15 -05:00
Brad King 377254b195 Merge topic 'help_fixup'
1667e244 Help: Fix command references in CMAKE_NETRC* variable documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1770
2018-02-20 11:40:18 -05:00
Kitware Robot 31419815aa CMake Nightly Date Stamp 2018-02-20 00:01:08 -05:00
Kitware Robot a99ff558af CMake Nightly Date Stamp 2018-02-19 00:01:12 -05:00
Kitware Robot 33ace6eb91 CMake Nightly Date Stamp 2018-02-18 00:01:06 -05:00
Raffi Enficiaud 67db3ff958 Fix eating "-L" in path names
When the path containing the wxLibraries contains a "-L", a "string(REPLACE "-L" ...)
replaces the content and results in a wrong path. The regex fixes this.
2018-02-17 16:15:57 +01:00
Kitware Robot 3b6fe84cb7 CMake Nightly Date Stamp 2018-02-17 00:01:14 -05:00
Alex Turbov 689eeb67cb string: Add JOIN subcommand
This is just like CONCAT but accepts a glue string to put between
each value.  `JOIN ""` is equivalent to `CONCAT`.
2018-02-16 10:04:47 -05:00
Edward Z. Yang b25b39ad76 CheckCSourceRuns: Teach CHECK_C_SOURCE_RUNS to log run output
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
Fixes: #17745
2018-02-16 09:51:26 -05:00
luz.paz 287e7a175c Maint: misc. typos
Found via `codespell`
2018-02-16 09:47:17 -05:00
Brad King eded0bae2e Merge branch 'help_fixup' into release-3.11
Merge-request: !1770
2018-02-16 09:42:09 -05:00
Shane Parris 1667e24453 Help: Fix command references in CMAKE_NETRC* variable documentation 2018-02-16 09:41:03 -05:00
Brad King 524696ec10 Merge topic 'file_cmd_touch'
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
2018-02-16 09:39:47 -05:00
Brad King d97c9ffb6c Merge topic 'genex-IN_LIST-operator'
5089f560 Genex: Add IN_LIST logical operator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1724
2018-02-16 09:22:56 -05:00
Kitware Robot 269722ae5b CMake Nightly Date Stamp 2018-02-16 00:01:12 -05:00
Stefan Hacker c01eede894 FindZLIB: Search names per directory
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.
2018-02-15 21:38:48 +01:00
Robert Dailey a1dee224b8 CMake: Enable /MP for MSVC toolchain
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
2018-02-15 10:45:37 -06:00
Shane Parris e78e24f68c Replaces execute_process calls to touch files with file(TOUCH) calls 2018-02-15 10:54:38 -05:00
Shane Parris 602988e1e5 Adds file(TOUCH) and file(TOUCH_NOCREATE) sub-commands 2018-02-15 10:54:18 -05:00
Patrick Stewart ed000d7d30 Ninja: Don't add custom command outputs to phony rule for CMake inputs 2018-02-15 15:03:53 +00:00
Brad King a2ec98b7d9 Merge topic 'enhanced-UseSWIG-Module'
0bef9eb4 UseSWIG: modernize module
d6048bd1 UseSWIG: Re-work test framework

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1707
2018-02-15 08:50:29 -05:00
Brad King b5d18cbd77 Merge topic 'directory-property-TESTS'
b513a879 Tests management: add TESTS directory property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1748
2018-02-15 08:49:44 -05:00
Brad King cab9838b4c Merge branch 'release-3.11' 2018-02-15 08:43:32 -05:00
Brad King 8bd3e13ec3 Merge topic 'export-android-mk'
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
2018-02-15 08:42:47 -05:00
Brad King 02edf08be2 Merge branch 'export-android-mk' into release-3.11
Merge-request: !1766
v3.11.0-rc1
2018-02-15 08:42:07 -05:00
Kitware Robot cbdec57937 CMake Nightly Date Stamp 2018-02-15 00:01:08 -05:00
Brad King b6d68766b1 Android.mk: Fix export of static libraries with PRIVATE dependencies
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.
2018-02-14 11:24:05 -05:00
Brad King 56e1688517 Android.mk: Evaluate generator expressions up front
When exporting `INTERFACE_LINK_LIBRARIES`, we must evaluate generator
expressions first, before expanding the `;` list, in case they contain
or generate semicolons.
2018-02-14 11:19:47 -05:00
Brad King ead859f50c Merge topic 'ninja-cmd'
22e8b3af Ninja: Generate scripts for long custom command sequences

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1604
2018-02-14 09:43:38 -05:00
Brad King 34d35cd592 Merge topic 'help_string_MAKE_C_IDENTIFIER'
a71ab3be Help: Expand string(MAKE_C_IDENTIFIER) docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1760
2018-02-14 09:36:59 -05:00
Brad King 7593c9ce8c Merge topic 'const-members'
b721b9a3 cmVisualStudio10TargetGenerator: Make some data members const; simplify

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1750
2018-02-14 09:36:17 -05:00
Marc Chevrier 0bef9eb410 UseSWIG: modernize module 2018-02-14 08:35:04 +01:00
Marc Chevrier d6048bd153 UseSWIG: Re-work test framework 2018-02-14 08:35:04 +01:00
Kitware Robot d870148537 CMake Nightly Date Stamp 2018-02-14 00:01:12 -05:00
Brad King 58c637643d Merge topic 'more-misc-typos'
193082a3 MAINT: Misc. typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1758
2018-02-13 11:28:31 -05:00