summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Test namespaces with exported JARsMatthew Woehlke2017-04-213-2/+6
|
* UseJava: Support namespaced exportsMatthew Woehlke2017-04-211-15/+21
| | | | | | | | | Add NAMESPACE option to export_jars and install_jar_exports. Import JAR's as imported static libraries rather than custom targets, as this is necessary to allow the imported targets to contain ':' in their names. (This also means they won't show up in VS projects, which is more consistent with other imported targets.) Also, improve the documentation to be more stylistically consistent with documentation elsewhere.
* Merge branch 'release'Brad King2017-04-200-0/+0
|\
| * Merge branch 'FindBoost-fix-backslash-tolerance' into releaseBrad King2017-04-191-2/+3
| |\
| * \ Merge branch 'FindOpenSSL-more-precompiled' into releaseBrad King2017-04-191-0/+4
| |\ \
* | \ \ Merge topic 'remove-vs7.1-generator'Brad King2017-04-2042-246/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c94f1bcf Drop Visual Studio 7 .NET 2003 generator a4452fd8 cmGlobalVisualStudioGenerator: Drop VS7 enumeration value 6e66fe5f cmGlobalVisualStudio8Generator: Drop unused GetDocumentation method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !723
| * | | | Drop Visual Studio 7 .NET 2003 generatorBrad King2017-04-1939-231/+45
| | | | | | | | | | | | | | | | | | | | This generator has been deprecated since CMake 3.6. Remove it.
| * | | | cmGlobalVisualStudioGenerator: Drop VS7 enumeration valueBrad King2017-04-194-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | We no longer support the VS 7.0 (.NET 2002) IDE, so drop the enumeration value corresponding to its version.
| * | | | cmGlobalVisualStudio8Generator: Drop unused GetDocumentation methodBrad King2017-04-192-10/+0
| | | | | | | | | | | | | | | | | | | | This has been moved to the factory.
* | | | | Merge topic 'FindBoost-fix-backslash-tolerance'Brad King2017-04-201-2/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 2516bccd FindBoost: Restore tolerance of backslashes in paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !721
| * | | | FindBoost: Restore tolerance of backslashes in pathsAlex Turbov2017-04-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc1~136^2 (FindBoost: Search official location of prebuilt binaries on Windows, 2016-12-21) we pass input paths through `_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS` in more places than before. This broke tolerance of backslashes in paths provided by the user due to the macro argument re-parsing. Turn `_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS` into a function instead of macro to avoid re-parsing of macro arguments. Fixes: #16816
* | | | | Merge topic 'FindOpenSSL-more-precompiled'Brad King2017-04-201-0/+4
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 16ef163f FindOpenSSL: Add more library name alternatives Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !713
| * | | | FindOpenSSL: Add more library name alternativesAlex Turbov2017-04-191-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | Add names found in OpenSSL 1.1.0 builds from [1]. [1] https://www.npcglib.org/~stathis/blog/precompiled-openssl/
* | | | Merge topic 'doc-dev-source-code'Brad King2017-04-204-36/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Help/dev: Adopt C++ subset rules in coding guideBrad King2017-04-192-24/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Help/dev: Adopt clang-format instructions in coding guideBrad King2017-04-192-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Simplify the `CONTRIBUTING.rst` document by moving the code style section over to our dedicated coding guide and linking to it instead.
| * | | | Help/dev: Add a CMake Source Code Guide placeholderBrad King2017-04-192-0/+16
| | |/ / | |/| | | | | | | | | | | | | | Create a dedicated document to cover the CMake source code for developers.
* | | | Merge topic 'update-kwsys'Brad King2017-04-208-188/+194
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 697a5d64 Merge branch 'upstream-KWSys' into update-kwsys 5785482c KWSys 2017-04-19 (9f6ffaff) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !716
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-04-198-188/+194
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-04-19 (9f6ffaff)
| | * | | | KWSys 2017-04-19 (9f6ffaff)KWSys Upstream2017-04-198-188/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | CMake Nightly Date StampKitware Robot2017-04-201-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'objlib-extend'Brad King2017-04-1965-188/+610
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Allow OBJECT libraries to be installed, exported, and importedRobert Maynard2017-04-1838-94/+362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | Genex: Allow TARGET_OBJECTS to be used everywhereRobert Maynard2017-04-1812-14/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | Genex: Reject TARGET_OBJECTS on non-object libraries earlierBrad King2017-04-1811-41/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Tests: ExportImport C code should use explicit (void) in prototypesRobert Maynard2017-04-181-12/+12
| | | | | |
| * | | | | cmInstallTargetGenerator: Re-order GenerateScriptForConfig logicBrad King2017-04-181-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not populate some local variables before switching on the target type.
| * | | | | cmGlobalGenerator: Add method to check if object file location is knownBrad King2017-04-183-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | cmGeneratorTarget: Add method to get the object file directoryBrad King2017-04-182-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `GetObjectDirectory` method to get the target's object file directory for a specific configuration.
| * | | | | cmGeneratorTarget: Factor out a GetTargetObjectNames methodBrad King2017-04-183-29/+43
| | | | | |
| * | | | | cmGeneratorTarget: Drop default GetLinkerLanguage config argumentBrad King2017-04-172-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Update one remaining call site to avoid using the default.
* | | | | | Merge topic 'test-CheckIPOSupported'Brad King2017-04-1910-0/+99
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eeb58c5c Tests: Add cases for typical CheckIPOSupported usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !700
| * | | | | | Tests: Add cases for typical CheckIPOSupported usageRuslan Baratov2017-04-1810-0/+99
| | | | | | |
* | | | | | | Merge topic 'fix-CMakeTestAllGenerators'Brad King2017-04-192-49/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Tests: Drop machine-specific logic from CMakeTestAllGeneratorsBrad King2017-04-181-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Tests: Run CMakeTestAllGenerators seriallyBrad King2017-04-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test may take a long time because it runs many other tools. Do not make it compete with other tests for resources.
| * | | | | | | Tests: Fix CMakeTestAllGenerators generator listBrad King2017-04-181-27/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge topic 'doc-CMAKE_MATCH_n'Brad King2017-04-195-24/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Help: Document CMAKE_MATCH_<n> variablesBrad King2017-04-185-4/+17
| | | | | | | | |
| * | | | | | | | Help: Link from if(MATCHES) to regex specification docsBrad King2017-04-182-1/+3
| | | | | | | | |
| * | | | | | | | Help: Format string() command regex specification docsBrad King2017-04-181-20/+30
| |/ / / / / / /
* | | | | | | | Merge topic 'findmpi-add-imported-targets'Brad King2017-04-197-0/+113
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ed9f635 FindMPI: Add test case 86979bb5 FindMPI: Add IMPORTED targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !707
| * | | | | | | | FindMPI: Add test caseChristian Pfeiffer2017-04-186-0/+84
| | | | | | | | |
| * | | | | | | | FindMPI: Add IMPORTED targetsChristian Pfeiffer2017-04-151-0/+29
| | | | | | | | |
* | | | | | | | | Merge topic 'doc-find-path-sep'Brad King2017-04-192-2/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3022545f Help: Document find command search path separators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !718
| * | | | | | | | | Help: Document find command search path separatorsBrad King2017-04-182-2/+8
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge topic 'cmake-gui-desktop-icon-wayland'Brad King2017-04-192-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86787633 cmake-gui: Fix display of icon under Wayland. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !715
| * | | | | | | | cmake-gui: Fix display of icon under Wayland.Clinton Stimpson2017-04-172-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #16797
* | | | | | | | CMake Nightly Date StampKitware Robot2017-04-191-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'tcc-enable_exports'Brad King2017-04-181-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11ab003b TinyCC: Support ENABLE_EXPORT property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !711