summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Xcode: Compute version number earlierBrad King2017-04-212-10/+14
|
* Merge branch 'release'Brad King2017-04-210-0/+0
|\
| * Merge branch 'cpack-rpm-buildrequires-docs' into releaseBrad King2017-04-201-0/+13
| |\
| * \ Merge branch 'fix-vs2017-guid-braces' into releaseBrad King2017-04-201-7/+2
| |\ \
* | \ \ Merge topic 'enable_ptx_compilation'Brad King2017-04-2120-11/+231
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23691d78 CUDA: Allow sources to be compiled to .ptx files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !725
| * | | | CUDA: Allow sources to be compiled to .ptx filesRobert Maynard2017-04-2020-11/+231
| | | | | | | | | | | | | | | | | | | | | | | | | When the target property `CUDA_PTX_COMPILATION` is enabled CUDA OBJECT libraries will generate ptx files instead of object files.
* | | | | Merge topic 'cpack-rpm-buildrequires-docs'Brad King2017-04-211-0/+13
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 8b3693e4 CPack/RPM doc: CPACK_RPM_BUILDREQUIRES docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !730
| * | | | CPack/RPM doc: CPACK_RPM_BUILDREQUIRES docsDomen Vrankar2017-04-201-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing documentation for an already existing CPackRPM source rpm packages feature. Fixes #16814
* | | | | Merge topic 'kwsys-import-cleanup'Brad King2017-04-212-10/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93219c40 Merge branch 'upstream-KWSys' into kwsys-import-cleanup 22729eae KWSys 2017-04-20 (8785f84f) d88a511d kwsys: match upstream changes a139b81a update-kwsys: apply changes made in CMake to the import e832c32c kwsys: remove extra attribute Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Brad King <brad.king@kitware.com> Merge-request: !728
| * \ \ \ \ Merge branch 'upstream-KWSys' into kwsys-import-cleanupBen Boeckel2017-04-200-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-04-20 (8785f84f)
| | * | | | | KWSys 2017-04-20 (8785f84f)KWSys Upstream2017-04-202-18/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 8785f84f4760da060cdb2499155bb39532f8c053 (master). Upstream Shortlog ----------------- Ben Boeckel (2): ac0c67d2 gitattributes: indicate attributes to ignore when importing 3dfeb55e gitattributes: rename the c-style attribute
| * | | | | | kwsys: match upstream changesBen Boeckel2017-04-201-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the import to merge cleanly.
| * | | | | | update-kwsys: apply changes made in CMake to the importBen Boeckel2017-04-201-1/+2
| | | | | | |
| * | | | | | kwsys: remove extra attributeBen Boeckel2017-04-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is set in `Source/.gitattributes` already and does not need to be set inside of the import.
* | | | | | | Merge topic 'GNUInstallDirs-add-RUNSTATEDIR'Brad King2017-04-216-18/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40814a7c GNUInstallDirs: Add RUNSTATEDIR variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !706
| * | | | | | | GNUInstallDirs: Add RUNSTATEDIR variableFelix Geyer2017-04-206-18/+35
| | | | | | | |
* | | | | | | | Merge topic 'fix-vs2017-guid-braces'Brad King2017-04-211-7/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd7e8f33 VS: Fix project reference inspection in VS IDE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !727
| * | | | | | | VS: Fix project reference inspection in VS IDERichard Walters2017-04-201-7/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The braces around project reference GUIDs for vcxproj projects were apparently optional in the past, but Visual Studio 2017 is more strict, displaying a warning, and not displaying project reference properties unless the braces are present. Fixes: #16820
* | | | | | | Merge topic '16760-refactor-get-mac-content-directory'Brad King2017-04-2120-210/+329
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf320f7c Replace boolean `implib` parameters with enum Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !662
| * | | | | | | Replace boolean `implib` parameters with enumGregor Jasny2017-04-2020-210/+329
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Named enumeration values are much clearer at call sites and add more type safety.
* | | | | | | Merge topic 'unified-commandline-length'Brad King2017-04-215-55/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbb5c3ef Ninja,Makefile: Unify command line limit logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !705
| * | | | | | | Ninja,Makefile: Unify command line limit logicChristian Pfeiffer2017-04-195-55/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the logic to cmSystemTools to be shared among the generators. Revise the implementation and add comments justifying each possible source for a limit.
* | | | | | | | Merge topic 'FindwxWidgets-verify-wx-config'Brad King2017-04-211-0/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8b77084 FindwxWidgets: Verify existence of libraries reported by wx-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !704
| * | | | | | | | FindwxWidgets: Verify existence of libraries reported by wx-configJan Mrázek2017-04-201-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the Ubuntu package `libwxgtk3-dev` is not installed, FindwxWidgets succeeds even the required libraries are not actually found. The reason for that is that `wx-config` does not perform any kind of check and uses hard-coded values. This affects e.g. KiCAD build process and makes it fail with a confusing error message [1]. The solution is to check for presence of every library file obtained from `wx-config`. [1] https://bugs.launchpad.net/kicad/+bug/1630020
* | | | | | | | | Merge topic '16795-xcode-system-header-search-paths'Brad King2017-04-211-4/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffdde4a9 Xcode: Use SYSTEM_HEADER_SEARCH_PATHS attribute for system includes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !726
| * | | | | | | | | Xcode: Use SYSTEM_HEADER_SEARCH_PATHS attribute for system includesGregor Jasny2017-04-191-4/+33
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Closes #16795
* | | | | | | | | Merge topic 'autogen-fixes'Brad King2017-04-216-5/+111
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09035319 Autogen: Pass explicit predefines header to moc if possible Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !671
| * | | | | | | | | Autogen: Pass explicit predefines header to moc if possibleAleix Pol2017-04-206-5/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt is relying on whoever calls moc to include a file with the predefined values that will be used by the compiler, otherwise moc takes wrong paths and weird things happen. Instead, generate an include file and feed it to all mocs to make sure it's generating correct code. Co-Author: Sebastian Holtermann <sebholt@xwmw.org> Fixes: #16640
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-04-211-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | 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>
generated by cgit v0.12 at 2024-10-20 07:58:18 (GMT)