Commit Graph

9456 Commits

Author SHA1 Message Date
Marc Chevrier
52b298bd03 FindPython: ensure Python_ROOT_DIR is always searched first 2019-05-31 19:05:04 +02:00
Brad King
720253393c Merge topic 'ninja-cmcldeps'
fd28e24947 Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3404
2019-05-31 09:10:51 -04:00
Brad King
d8e90be04d Merge topic 'FindPython-remove-erroneous-code'
4a871d51a3 FindPython*: remove erroneous code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3400
2019-05-31 09:08:40 -04:00
Marc-André Moreau
fd28e24947 Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RC 2019-05-30 13:11:34 -04:00
Brad King
7a8a24d028 Merge topic 'FindBoost-debug-messages'
35bfc85d95 FindBoost: Refactor debug messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3382
2019-05-30 10:41:14 -04:00
Marc Chevrier
4a871d51a3 FindPython*: remove erroneous code 2019-05-30 13:40:46 +02:00
Brad King
067a4f484b Merge topic 'clang-gnulike-support'
74829f01b1 Help: Add notes for topic 'clang-gnulike-support'
19669abe1d Tests: handle string escaping differences with NMake+clang
a2a90f41e3 Tests: require C++14 for the Tutorial
4819ff9647 Tests: fix failures with gnu mode clang on windows
26af0b25e7 cmake: use correct stack size with gnu mode clang on windows
d44c0db0b2 clang: setup correct configuration in gnu mode
b7d5ef23e9 cmGlobalNinjaGenerator: use gnu compatible paths with clang in gnu mode
3d0210d8dc binutils: add the llvm-* variants to the tool lists.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Francesco Bertolaccini <francesco@bertolaccini.dev>
Acked-by: Stanislav Ershov <digital.stream.of.mind@gmail.com>
Acked-by: Saleem Abdulrasool <compnerd@compnerd.org>
Merge-request: !2992
2019-05-29 09:22:12 -04:00
Brad King
8b42d56002 Merge topic 'FindZLIB-names'
4ff3ab2ac9 FindZLIB: Add more zlib library names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3384
2019-05-29 09:19:38 -04:00
Brad King
5a720a30fa Merge topic 'samu'
a15595e4c9 Ninja: Consider 'samu' when looking for CMAKE_MAKE_PROGRAM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3380
2019-05-29 09:18:35 -04:00
Brad King
a1c291e0ac Merge topic 'swift-wrapper'
6baa80d1e3 Modules: correct linker wrapper flag for Swift

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3390
2019-05-29 09:17:44 -04:00
Brad King
f093ac36c0 Merge topic 'linker-preference'
abea06efdf Modules: setup `CMAKE_Swift_LINKER_PREFERENCE`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3373
2019-05-29 09:16:17 -04:00
Brad King
0f9d7dc3ba Merge topic 'findopenmp-new-dates'
26f2b65fec FindOpenMP: Add 5.0 and VS19 spec dates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3375
2019-05-29 09:15:09 -04:00
Brad King
c7db6ce986 Merge topic 'flex'
a7754448f6 FindFLEX: fix example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3379
2019-05-28 14:59:48 -04:00
Alexander Neumann
4ff3ab2ac9 FindZLIB: Add more zlib library names
Account for all names that can be generated by the upstream zlib build
system.

Issue: #18029
2019-05-28 14:51:45 -04:00
Dennis Klein
35bfc85d95 FindBoost: Refactor debug messages
* Deduplicate code with helper functions
* Remove double printing of _boost_TEST_VERSIONS
* Fix #19158
* Add printing of a few additional variables
2019-05-28 20:46:43 +02:00
Michael Forney
a15595e4c9 Ninja: Consider 'samu' when looking for CMAKE_MAKE_PROGRAM
`samurai` is an alternative implementation of ninja and is a drop-in
replacement.  `samu --version` reports the ninja version it is
compatible with.
2019-05-28 14:16:29 -04:00
Saleem Abdulrasool
6baa80d1e3 Modules: correct linker wrapper flag for Swift
This was sitting locally but was missed in previous commits.  This
enables the use of `LINKER:` when building Swift code bases.
2019-05-28 09:21:41 -07:00
Brad King
dfd2e0a4ed Merge topic 'FindThreads-doc-c++'
a38b63c1bb FindThreads: Drop incorrect docs about usage with C++

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3391
2019-05-28 11:58:07 -04:00
Brad King
f326591c13 Merge topic 'FindPython-find_framework'
62d6ed79fb FindPython: Add variable 'Python_FIND_FRAMEWORK' to control frameworks lookup.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3374
2019-05-28 11:53:21 -04:00
Brad King
76cb43c7c5 Merge topic 'GetPrerequisites-use-if-IN_LIST'
3dfc8b9bd6 GetPrerequisites: use if(IN_LIST) instead of foreach

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3299
2019-05-28 11:51:58 -04:00
Brad King
da0937c04f Merge topic 'swift-response'
9e5457d3b4 Ninja,Swift: correct response file handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3367
2019-05-28 11:50:28 -04:00
Brad King
56fec2fe8f Merge topic 'FindICU-find-names'
59c392b44e FindICU: Pass explicit NAMES argument to find command calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3371
2019-05-28 11:49:17 -04:00
Brad King
540640fc0a Merge topic 'FindBoost-contract-requires-compile-features'
b915a42585 FindBoost: Add compiler features for Boost Contract library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3368
2019-05-28 11:42:12 -04:00
Brad King
a38b63c1bb FindThreads: Drop incorrect docs about usage with C++
Drop the sentence added by commit 5a5a1d90f0 (Help: FindThreads not
needed with modern C++., 2019-01-09, v3.14.0-rc1~186^2) about not
needing the module with modern C++.  The module is often still needed.

Fixes: #19297
2019-05-28 11:36:27 -04:00
Marcin Ślusarz
a7754448f6 FindFLEX: fix example
Binaries using flex must link with the detected library.
2019-05-26 22:34:06 +02:00
Saleem Abdulrasool
abea06efdf Modules: setup CMAKE_Swift_LINKER_PREFERENCE
Swift's driver will invoke the C++ driver (`clang++`) to invoke the
linker.  Additionally, it will configure the command line to deal with
the linkage runtime support object (`swiftrt.o` or `swiftrt.obj`) to be
added at the right time (similar to C/C++).  Since it indirects through
`clang++` it will properly setup the linker invocation for C++ and C as
well.  This should permit the correct linker driver to be invoked in
multi-language projects.

Closes #19299
2019-05-24 10:33:25 -07:00
Christian Pfeiffer
26f2b65fec FindOpenMP: Add 5.0 and VS19 spec dates
Fixes: #19289
2019-05-24 19:01:28 +02:00
Marc Chevrier
62d6ed79fb FindPython: Add variable 'Python_FIND_FRAMEWORK' to control frameworks lookup. 2019-05-24 18:44:43 +02:00
Brad King
59c392b44e FindICU: Pass explicit NAMES argument to find command calls
This improves readability and avoids an undocumented signature variant.

Fixes: #19302
2019-05-24 10:31:35 -04:00
Alex Turbov
b915a42585 FindBoost: Add compiler features for Boost Contract library 2019-05-24 07:13:56 -04:00
Zsolt Parragi
d44c0db0b2 clang: setup correct configuration in gnu mode 2019-05-23 23:35:33 +02:00
Saleem Abdulrasool
9e5457d3b4 Ninja,Swift: correct response file handling
The response file was being written but not used due to the wrong
variable being configured for Swift.  Swift does compile+link in a
single phase and does not use the `<OBJECTS>` placeholder.  Use the
`<SWIFT_SOURCES>` placeholder instead for the response file substitution
which serves the same purpose.
2019-05-23 14:05:37 -07:00
Ben Boeckel
32e4f236b7 ARMClang: fix policy manipulation in the compiler module
Policies have their own scoping and cannot be set within a function
without affecting callers.
2019-05-23 09:19:59 -04:00
Ben Boeckel
3dfc8b9bd6 GetPrerequisites: use if(IN_LIST) instead of foreach 2019-05-23 09:15:04 -04:00
Brad King
22df62b58d Merge topic 'swift-flag-variables'
24223ac84b Modules: add Swift MSVC_RUNTIME_LIBRARY flags
7e636fd8e0 Modules: add `CMAKE_Swift_FRAMEWORK_SEARCH_FLAG`
0fbf936b46 Modules: remove `CMAKE_INCLUDE_FLAG_SEP_Swift`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3353
2019-05-23 09:02:55 -04:00
Brad King
5222400d9f Merge topic 'FindPython-find_strategy'
8517b549f4 FindPython: Add policy to manage lookup stratgey default.
9f205acefe FindPython: Implement lookup strategies.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3354
2019-05-23 08:59:25 -04:00
Brad King
79c6a573f4 Merge topic 'swift-flags'
02c14b7fcd Ninja,Swift: pass along DEFINES/FLAGS/INCLUDES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3355
2019-05-23 08:55:16 -04:00
Brad King
f83f29dbaa Merge topic 'vs-ApplicationTypeRevision'
9c07cefee5 VS: Fix ApplicationTypeRevision in builtin check projects
639e14def6 VS: Factor out helper to compute ApplicationTypeRevision

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3350
2019-05-22 10:27:01 -04:00
Saleem Abdulrasool
02c14b7fcd Ninja,Swift: pass along DEFINES/FLAGS/INCLUDES
Since the Swift model does a single compile/link phase, we would not
get the compile definitions, includes, and options past along to the
build of the module.  Compute these for the target when constructing
the main command.
2019-05-21 08:53:50 -07:00
Saleem Abdulrasool
24223ac84b Modules: add Swift MSVC_RUNTIME_LIBRARY flags
This adds support for the newly minted `-libc` flag to the Swift driver
invocation.  These allow users to control the MSVC linkage properly on
Windows targets.
2019-05-21 08:38:23 -07:00
Saleem Abdulrasool
7e636fd8e0 Modules: add CMAKE_Swift_FRAMEWORK_SEARCH_FLAG
Swift supports frameworks and uses them across all OSes.  They are added
using the `-F` flag.  There must be a space following the flag and
before the parameter.
2019-05-21 08:38:23 -07:00
Saleem Abdulrasool
0fbf936b46 Modules: remove CMAKE_INCLUDE_FLAG_SEP_Swift
The include flag specifier should be specified multiply.  The separator
was being misused for adding a space after the `-I` flag.  Correct this
to get multiple include paths correct.
2019-05-21 08:38:23 -07:00
Brad King
4c0fb923b7 IAR: Do not print compiler architecture id for non-IAR compilers
The compiler identification message was modified in commit ea83d0f8fb
(IAR: Generalize and add support for IAR RX compiler, 2019-04-05) to
include the architecture id since IAR compilers are arch-specific.
Revise the logic to avoid modifying the message for other compilers.
2019-05-21 10:58:18 -04:00
Marc Chevrier
8517b549f4 FindPython: Add policy to manage lookup stratgey default. 2019-05-21 16:13:27 +02:00
Marc Chevrier
9f205acefe FindPython: Implement lookup strategies.
Configration variable Python_FIND_STRATEGY controls the lookup startegy.
Possible values are LOCATION and VERSION.

Fixes: #19159
2019-05-21 16:13:27 +02:00
Brad King
8538685c85 Merge topic 'FindPostgreSQL-config-support'
368bcba28a FindPostgreSQL: Find debug lib, imported configs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3298
2019-05-21 09:44:19 -04:00
Brad King
9c07cefee5 VS: Fix ApplicationTypeRevision in builtin check projects
Do not use the entire `CMAKE_SYSTEM_VERSION`, but rather the first two
components only.

Fixes: #19275
2019-05-21 08:50:37 -04:00
Andrei Lebedev
368bcba28a FindPostgreSQL: Find debug lib, imported configs
* 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>
2019-05-20 11:29:04 -04:00
Brad King
a9fb9a8774 Merge topic 'ninja-swift'
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
2019-05-20 10:55:27 -04:00
Zsolt Parragi
3d0210d8dc binutils: add the llvm-* variants to the tool lists.
This allows cmake to use the ar/ranlib/objdump/ld tools on windows
without mingw installed.

These tools are selected when clang is in GNU command line mode.
2019-05-17 19:11:34 +02:00