summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindProtobuf: Rename imported targets to match upstream namesBrad King2017-05-222-30/+30
| | | | | | | | | Rename our recently added imported targets to match those provided by the upstream's CMake-based build. That way a project using `find_package(Protobuf)` can get the same target names no matter how protobuf is found. Suggested-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
* Merge branch 'release'Brad King2017-05-220-0/+0
|\
| * Merge branch 'vs14-GNUtoMS' into releaseBrad King2017-05-171-0/+2
| |\
| * \ Merge branch 'source_group-TREE-relative-path' into releaseBrad King2017-05-176-23/+39
| |\ \
* | \ \ Merge topic 'add-findpackage-root-prefix'Brad King2017-05-2230-18/+581
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe8f08d2 find_*: Add docs for PackageRoot search path group 57744ca9 find_*: Add tests for PackageRoot search path group ef3d360a find_*: Add a new PackageRoot search path group Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !796
| * | | | find_*: Add docs for PackageRoot search path groupChuck Atkins2017-05-197-16/+58
| | | | |
| * | | | find_*: Add tests for PackageRoot search path groupChuck Atkins2017-05-1617-0/+476
| | | | |
| * | | | find_*: Add a new PackageRoot search path groupChuck Atkins2017-05-166-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new PackageRoot search path group allows the PackageName_ROOT cmake and environment variables to be used as search prefixes for all find_* commands called from within a find module
* | | | | Merge topic 'pgi-fix-windows'Brad King2017-05-227-8/+126
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4eb15824 Windows-PGI: Add platform definitions a94ae96e Windows-PGI: Adapt default compiler flags c2c2d366 ImplicitLinkInfo: Add support for PGI on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !794
| * | | | | Windows-PGI: Add platform definitionsChristian Pfeiffer2017-05-204-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PGI on Windows should use the Visual C++ linker and librarian and not the ar provided for legacy reasons. The compiler parameters themselves are the same as their Linux parameters and not compatible to MSVC however.
| * | | | | Windows-PGI: Adapt default compiler flagsChristian Pfeiffer2017-05-201-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PGI demands -Bdynamic (/MD equivalent) for linking together dynamic libraries, so we should make it our default mirroring the settings of e.g. Visual C++ and Intel C++.
| * | | | | ImplicitLinkInfo: Add support for PGI on WindowsChristian Pfeiffer2017-05-202-7/+61
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since PGI does not write linker directives into objects, the necessary libraries have to be parsed from commandline. PGI does however link the Visual C++ runtime libraries, so they have to be filtered out to ensure no collision with settings of other languages can occur.
* | | | | Merge topic 'UseEcos-update'Brad King2017-05-221-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47732280 UseEcos: Fix for separate <DEFINES> and <INCLUDES> placeholders Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !871
| * | | | | UseEcos: Fix for separate <DEFINES> and <INCLUDES> placeholdersFlorian Schmaus2017-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the module to account for commit v3.4.0-rc1~342^2 (Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables, 2015-07-13) and v2.6.0~537 (Create COMPILE_DEFINITIONS property for targets and source files, 2008-01-14). Fixes: #16904
* | | | | | Merge topic 'cxx-features-check-always'Brad King2017-05-221-13/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f74f01fe Check C++ features even without CMAKE_CXX_STANDARD for CMake itself Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !870
| * | | | | | Check C++ features even without CMAKE_CXX_STANDARD for CMake itselfBrad King2017-05-191-13/+16
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `CMake_NO_CXX_STANDARD` a user may still provide `-std=c++11` or similar flags in `CMAKE_CXX_FLAGS`, so we should still check for the available C++ features.
* | | | | | CMake Nightly Date StampKitware Robot2017-05-221-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-05-211-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-05-201-1/+1
| | | | | |
* | | | | | Merge topic 'target-depends-per-config'Brad King2017-05-194-14/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87a37e64 cmComputeTargetDepends: Avoid nested loops over configurations 5a913794 cmComputeTargetDepends: Avoid computing with empty configuration 70c65572 Tests: Fix RunCMake.CMP0022 tll case for Debug configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !865
| * | | | | | cmComputeTargetDepends: Avoid nested loops over configurationsBrad King2017-05-182-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `AddInterfaceDepends` is only called from `CollectTargetDepends` inside our loop over all configurations so it doesn't need its own such loop.
| * | | | | | cmComputeTargetDepends: Avoid computing with empty configurationBrad King2017-05-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `AddInterfaceDepends` to combine all configurations using the same approach that `CollectTargetDepends` does. Fixes: #16896
| * | | | | | Tests: Fix RunCMake.CMP0022 tll case for Debug configurationBrad King2017-05-182-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CMP0022-WARN-tll` case overrides legacy properties set by `target_link_libraries` so that we can verify that the policy warning is emitted. When building in the Debug configuration, the `_DEBUG` variant of the legacy property is set/checked too. Fix the test case to override both variants. Previously it only passed because `cmComputeTargetDepends::AddInterfaceDepends` always evaluated dependencies with the "" configuration.
* | | | | | | Merge topic 'solarisEmptyFileFix'Brad King2017-05-192-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1bfe3720 Tests: Ensure Solaris linker never sees empty contents Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !860
| * | | | | | | Tests: Ensure Solaris linker never sees empty contentsCraig Scott2017-05-182-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the following tests on Solaris builds: wrapping, qtwrapping and CMakeCommands.target_link_libraries
* | | | | | | | Merge topic 'solaris_testLibSONAME'Brad King2017-05-191-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94cd4505 Tests: Make function name not match SONAME Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !868
| * | | | | | | | Tests: Make function name not match SONAMECraig Scott2017-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We look for `SONAME` in the output of `readelf` to check whether the binary contains the field. Do not provide a symbol that may accidentally match. Fixes: #16894
* | | | | | | | | Merge topic 'FindProtobuf-targets'Brad King2017-05-197-0/+148
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37627217 Help: Add notes for topic 'FindProtobuf-targets' e4e1d194 FindProtobuf: add tests f29635b6 FindProtobuf: add targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !861
| * | | | | | | | | Help: Add notes for topic 'FindProtobuf-targets'Brad King2017-05-181-0/+5
| | | | | | | | | |
| * | | | | | | | | FindProtobuf: add testsAndré Apitzsch2017-05-185-0/+62
| | | | | | | | | |
| * | | | | | | | | FindProtobuf: add targetsAndré Apitzsch2017-05-181-0/+81
| | | | | | | | | |
* | | | | | | | | | Merge topic 'liblzma-fix-inline'Brad King2017-05-191-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb6142ab liblzma: Fix HAVE_INLINE and HAVE___INLINE checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !867
| * | | | | | | | | | liblzma: Fix HAVE_INLINE and HAVE___INLINE checksBrad King2017-05-171-2/+2
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The checks fail even on compilers that support the keywords because the linkage is broken: src.c:...: undefined reference to 'test' At the actual use sites we use `static inline` instead of just `inline`, so perform the check this way too to fix the linkage.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-05-191-1/+1
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'string-append'Brad King2017-05-1813-28/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e24af01 Use string(APPEND) in Modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !864
| * | | | | | | | | Use string(APPEND) in ModulesDaniel Pfeifer2017-05-1713-28/+28
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automate with: find Modules -type f -print0 | xargs -0 perl -i -0pe \ 's/set\(([a-zA-Z0-9_\$\{\}]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'
* | | | | | | | | Merge topic 'cpack-archive-per-component-filename'Brad King2017-05-189-17/+100
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e06e97d CPack/Archive: per component filenames support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !859
| * | | | | | | | | CPack/Archive: per component filenames supportDomen Vrankar2017-05-169-17/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for setting archive packager specific per component filenames and monolithic package filenames.
* | | | | | | | | | Merge topic 'source_group-TREE-relative-path'Brad King2017-05-186-23/+39
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4716f2be source_group: Restore TREE support for relative paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !852
| * | | | | | | | | source_group: Restore TREE support for relative pathsMateusz Janek2017-05-176-23/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit v3.8.1~4^2 (source_group: Fix TREE with root that is not current source dir, 2017-04-20) accidentally broke support for specifying paths relative to the source directory. Fix it and add a test covering the case. While at it, fix a typo in a variable name. Fixes: #16876
* | | | | | | | | | Merge topic 'vs14-GNUtoMS'Brad King2017-05-181-0/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c02d4d2a GNUtoMS: Add search path for VS 2015 environment scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !854
| * | | | | | | | | GNUtoMS: Add search path for VS 2015 environment scriptsAlex Ghosh2017-05-171-0/+2
| |/ / / / / / / /
* | | | | | | | | Merge topic 'rel-osx-qt-version'Brad King2017-05-181-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e41abbd Utilities/Release: Switch macOS binary to Qt 5.6.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !862
| * | | | | | | | | Utilities/Release: Switch macOS binary to Qt 5.6.2Brad King2017-05-171-1/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Update from 5.6.0.
* | | | | | | | | Merge topic 'fix-invalid-export-name'Brad King2017-05-181-7/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d754ad5 bindexplib: Skip symbols containing a dot (.) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !855
| * | | | | | | | | bindexplib: Skip symbols containing a dot (.)Albert Ziegenhagel2017-05-161-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbols including a dot are not valid and result in a `LNK1242` error when trying to create a library from the def file. Such symbols happen to be in object files when using PGI Fortran on Windows and compiling with debug symbols enabled. Those symbols do not need to be exported.
* | | | | | | | | | Merge topic 'update-kwsys'Brad King2017-05-1820-476/+345
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16ebd9f6 Merge branch 'upstream-KWSys' into update-kwsys 7be70ca6 KWSys 2017-05-16 (fe1f22ce) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !856
| * \ \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-05-1620-476/+345
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-05-16 (fe1f22ce)
| | * | | | | | | | | KWSys 2017-05-16 (fe1f22ce)KWSys Upstream2017-05-1620-476/+345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit fe1f22ceefdae18df33e5bab8483fec7a82d4cee (master). Upstream Shortlog ----------------- Adam Weisi (3): 8a799e36 Process: Improve definition ordering in header file 7d56ef24 Process: Save results from all children internally b7eba998 Process: Add APIs to get results of individual processes Ben Boeckel (2): cea71543 style: remove separator comments 874dc559 style: help clang-format near macros
* | | | | | | | | | | Merge topic 'ninja-compile_commands.json'Brad King2017-05-181-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b554caf7 Ninja: List compile_commands.json as generated by CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !849
generated by cgit v0.12 at 2025-01-17 06:29:11 (GMT)