Commit Graph

35616 Commits

Author SHA1 Message Date
Brad King 01d72391b3 Merge topic 'FindOpenSSL-more-precompiled'
16ef163f FindOpenSSL: Add more library name alternatives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !713
2017-04-20 08:46:47 -04:00
Brad King 96246fb9af Merge topic 'doc-dev-source-code'
caabb6e1 Help/dev: Adopt C++ subset rules in coding guide
0fd255ad Help/dev: Adopt clang-format instructions in coding guide
540b4cdc Help/dev: Add a CMake Source Code Guide placeholder

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !724
2017-04-20 08:46:01 -04:00
Brad King 09e3864b4b Merge topic 'update-kwsys'
697a5d64 Merge branch 'upstream-KWSys' into update-kwsys
5785482c KWSys 2017-04-19 (9f6ffaff)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !716
2017-04-20 08:45:42 -04:00
Kitware Robot 3452f8b209 CMake Nightly Date Stamp 2017-04-20 00:01:06 -04:00
Brad King caabb6e1f3 Help/dev: Adopt C++ subset rules in coding guide
Move the C++ subset rules from the `cmake-developer(7)` into our
dedicated coding guide since they do not need to be in user-facing
documentation.
2017-04-19 16:41:58 -04:00
Brad King 0fd255adf5 Help/dev: Adopt clang-format instructions in coding guide
Simplify the `CONTRIBUTING.rst` document by moving the code style
section over to our dedicated coding guide and linking to it instead.
2017-04-19 16:33:06 -04:00
Brad King 540b4cdc2b Help/dev: Add a CMake Source Code Guide placeholder
Create a dedicated document to cover the CMake source code for
developers.
2017-04-19 16:18:26 -04:00
Alex Turbov 16ef163fd6 FindOpenSSL: Add more library name alternatives
Add names found in OpenSSL 1.1.0 builds from [1].

[1] https://www.npcglib.org/~stathis/blog/precompiled-openssl/
2017-04-19 11:08:42 -04:00
Brad King 44f0d2d991 Merge topic 'objlib-extend'
eec93bce Allow OBJECT libraries to be installed, exported, and imported
93c89bc7 Genex: Allow TARGET_OBJECTS to be used everywhere
ac0cf7ff Genex: Reject TARGET_OBJECTS on non-object libraries earlier
8577978c Tests: ExportImport C code should use explicit (void) in prototypes
26cfd039 cmInstallTargetGenerator: Re-order GenerateScriptForConfig logic
25f3f22a cmGlobalGenerator: Add method to check if object file location is known
d596c550 cmGeneratorTarget: Add method to get the object file directory
930042f2 cmGeneratorTarget: Factor out a GetTargetObjectNames method
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !712
2017-04-19 10:47:31 -04:00
Brad King 9db9bb27ea Merge topic 'test-CheckIPOSupported'
eeb58c5c Tests: Add cases for typical CheckIPOSupported usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !700
2017-04-19 10:47:00 -04:00
Brad King a7e0453a32 Merge topic 'fix-CMakeTestAllGenerators'
9e338b57 Tests: Drop machine-specific logic from CMakeTestAllGenerators
2790ffc9 Tests: Run CMakeTestAllGenerators serially
f1e51ec3 Tests: Fix CMakeTestAllGenerators generator list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !720
2017-04-19 10:46:10 -04:00
Brad King 334efdebb8 Merge topic 'doc-CMAKE_MATCH_n'
eb08e1fe Help: Document CMAKE_MATCH_<n> variables
8dd99752 Help: Link from if(MATCHES) to regex specification docs
a0091a69 Help: Format string() command regex specification docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !719
2017-04-19 10:45:41 -04:00
Brad King c79e7e09a8 Merge topic 'findmpi-add-imported-targets'
3ed9f635 FindMPI: Add test case
86979bb5 FindMPI: Add IMPORTED targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !707
2017-04-19 10:45:03 -04:00
Brad King 89310b0b20 Merge topic 'doc-find-path-sep'
3022545f Help: Document find command search path separators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !718
2017-04-19 10:43:21 -04:00
Brad King 872d08ad34 Merge topic 'cmake-gui-desktop-icon-wayland'
86787633 cmake-gui:  Fix display of icon under Wayland.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !715
2017-04-19 10:42:10 -04:00
Brad King 697a5d64d8 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-04-19 (9f6ffaff)
2017-04-19 08:02:06 -04:00
KWSys Upstream 5785482ce0 KWSys 2017-04-19 (9f6ffaff)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 9f6ffaff4ed7b639b3523b43f41e70f75271f0cc (master).

Upstream Shortlog
-----------------

Brad King (3):
      e71a3406 Encoding: Add ToWindowsExtendedPath function
      41b8603c SystemTools: Use Encoding::ToWindowsExtendedPath
      edd8b5e0 FStream: Open files on Windows using UNC path

Chuck Atkins (1):
      0c4e58ec Silence warnings from newer CMake versions from CMP0048
2017-04-19 08:02:04 -04:00
Kitware Robot 3d3144bb02 CMake Nightly Date Stamp 2017-04-19 00:01:05 -04:00
Brad King 9e338b57b7 Tests: Drop machine-specific logic from CMakeTestAllGenerators
Drop hard-coded paths from this test.  If we later need machine-specific
environment entries we can add dedicated infrastructure for it to be
configured locally.
2017-04-18 15:12:22 -04:00
Brad King 2790ffc96f Tests: Run CMakeTestAllGenerators serially
This test may take a long time because it runs many other tools.
Do not make it compete with other tests for resources.
2017-04-18 15:10:17 -04:00
Brad King f1e51ec3a5 Tests: Fix CMakeTestAllGenerators generator list
Since `cmake --help` output now uses `[arch]` placeholders for the VS
generators, this test has been extracting invalid generator names.
Switch to using `cmake -E capabilities` to get a more robust listing of
the generators that does not depend on parsing human-readable help
output.
2017-04-18 15:05:59 -04:00
Brad King eb08e1febb Help: Document CMAKE_MATCH_<n> variables 2017-04-18 14:45:49 -04:00
Brad King 8dd9975263 Help: Link from if(MATCHES) to regex specification docs 2017-04-18 14:45:04 -04:00
Brad King a0091a697e Help: Format string() command regex specification docs 2017-04-18 14:44:50 -04:00
Brad King 3022545f14 Help: Document find command search path separators
The `find_*` commands read search paths from both CMake variables
and from environment variables.  Document how multiple values in
these variables should be separated.

Fixes: #16800
2017-04-18 14:22:20 -04:00
Ruslan Baratov eeb58c5c34 Tests: Add cases for typical CheckIPOSupported usage 2017-04-18 11:54:33 -04:00
Christian Pfeiffer 3ed9f63551 FindMPI: Add test case 2017-04-18 17:43:25 +02:00
Robert Maynard eec93bceec Allow OBJECT libraries to be installed, exported, and imported
Teach install() and export() to handle the actual object files.
Disallow this on Xcode with multiple architectures because it
still cannot be cleanly supported there.

Co-Author: Brad King <brad.king@kitware.com>
2017-04-18 11:36:10 -04:00
Robert Maynard 93c89bc75c Genex: Allow TARGET_OBJECTS to be used everywhere
Previously the `TARGET_OBJECTS` generator expression was limited
only to use in a buildsystem context so that Xcode's placeholders
in object file paths can be evaluated.  Lift this restriction so
that the expression can at least be used in most settings.

Co-Author: Brad King <brad.king@kitware.com>
2017-04-18 11:36:09 -04:00
Brad King ac0cf7ff4f Genex: Reject TARGET_OBJECTS on non-object libraries earlier
Move the diagnostic that rejects the TARGET_OBJECTS generator expression
in non-buildsystem context until after the check for whether the named
target is an object library.  This order will makes more sense than the
previous order once TARGET_OBJECTS is allowed in non-buildsystem
context.
2017-04-18 10:29:36 -04:00
Robert Maynard 8577978c58 Tests: ExportImport C code should use explicit (void) in prototypes 2017-04-18 09:03:34 -04:00
Brad King 26cfd039a9 cmInstallTargetGenerator: Re-order GenerateScriptForConfig logic
Do not populate some local variables before switching on the target
type.
2017-04-18 09:03:33 -04:00
Brad King 25f3f22a1a cmGlobalGenerator: Add method to check if object file location is known
Add a `HasKnownObjectFileLocation` method returning whether we know the
exact location of object files produced by the native build system.
This is true everywhere except on Xcode when an architecture placeholder
is used.
2017-04-18 09:03:33 -04:00
Brad King d596c5504e cmGeneratorTarget: Add method to get the object file directory
Add a `GetObjectDirectory` method to get the target's object file
directory for a specific configuration.
2017-04-18 09:03:33 -04:00
Brad King 930042f2d9 cmGeneratorTarget: Factor out a GetTargetObjectNames method 2017-04-18 09:03:32 -04:00
Brad King afc492d58f Merge topic 'tcc-enable_exports'
11ab003b TinyCC: Support ENABLE_EXPORT property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !711
2017-04-18 08:54:45 -04:00
Brad King f7e3a34d3c Merge topic 'ipo-var-per-config'
470437f6 Support CMAKE_INTERPROCEDURAL_OPTIMIZATION_<CONFIG>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !709
2017-04-18 08:54:24 -04:00
Brad King eedcaf44bc Merge topic 'cpackifw-search-algorithm'
049be8b9 CPackIFW: Added new QtIFW versions for search
d97978b8 CPackIFW: Improved QtIFW search algorithm

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !674
2017-04-18 08:54:04 -04:00
Brad King 59ffd81f17 Merge topic 'findmpi-mark-library-advanced'
d9d280f5 FindMPI: Mark old MPI library entries as advanced

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !708
2017-04-18 08:53:21 -04:00
Brad King a3636dde57 Merge topic 'fix-CMP0026-old'
5e616fcf CMP0026: Fix OLD behavior with file written during configure step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !710
2017-04-18 08:51:54 -04:00
Kitware Robot c6a41a13bc CMake Nightly Date Stamp 2017-04-18 00:01:04 -04:00
Clinton Stimpson 86787633f8 cmake-gui: Fix display of icon under Wayland.
Fixes: #16797
2017-04-17 16:48:25 -06:00
Ruslan Baratov 470437f6f9 Support CMAKE_INTERPROCEDURAL_OPTIMIZATION_<CONFIG> 2017-04-18 03:10:34 +08:00
hsc 11ab003b3a TinyCC: Support ENABLE_EXPORT property
Replace the default -Wl,--export-dynamic with -rdynamic.
2017-04-17 17:34:52 +02:00
Brad King 3ab4681efa cmGeneratorTarget: Drop default GetLinkerLanguage config argument
Update one remaining call site to avoid using the default.
2017-04-17 10:54:00 -04:00
Brad King be2c45f2a9 Merge topic 'prepare-per-config-objects'
ca697bfc cmGeneratorTarget: Drop obj libs from GetConfigCommonSourceFiles
e44a8d2c Xcode: Refactor loop over all sources
97cc29c7 VS: Teach generators how to mark per-config source files
2f6f6f0c Xcode: Use config-specific object library files on link lines
888c8af6 VS: List config-specific object library files on link lines
40aa6c05 cmGeneratorTarget: Add method to collect all sources for all configs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !701
2017-04-17 10:31:02 -04:00
Brad King c003f1b996 Merge topic 'file-copy-relative-from'
99b90dbf file: Add COPY/INSTALL option for fixed layout relative to a directory
dadf1570 file: Refactor COPY/INSTALL relative path handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !703
2017-04-17 10:30:25 -04:00
Brad King ddd2b02455 Merge topic 'iwyu-mapping'
d2b0a47c Add include-what-you-use mapping

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !692
2017-04-17 10:30:10 -04:00
Brad King d4db7a2ec0 Merge topic 'simpler-import-lib-check'
9a5dcc32 cmExportBuildFileGenerator: use HasImportLibrary

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !699
2017-04-17 10:29:37 -04:00
Brad King c0323cbf5f Merge topic 'vs-custom-kits-dir'
fee01194 VS: Add an environment variable for the Windows 10 kits directory
b80c6d12 VS: Refactor Win 10 Kits root detection to support multiple roots

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !696
2017-04-17 10:29:15 -04:00