Commit Graph

7620 Commits

Author SHA1 Message Date
Brad King
fb99b0b87b Merge branch 'cuda-dlink-no-deprecated-gpu' into release-3.9 2017-06-13 09:17:06 -04:00
Robert Maynard
7368ade250 CUDA: When linking device code suppress CUDA 8.0+ deprecation warnings
The CUDA compiler automatic deprecation warnings are pure noise when
doing device linking, and should be suppressed to reduce the amount of
confusion from users.
2017-06-13 09:15:19 -04:00
Brad King
70ec0f2ad1 Merge branch 'doc-pkgconfig-list' into release-3.9 2017-06-12 16:24:50 -04:00
Rolf Eike Beer
70a6cb70f6 FindPkgConfig: mention that variables will be ;-lists 2017-06-12 22:03:20 +02:00
Rolf Eike Beer
6610fdbed2 FindPkgConfig: fix confusing indentation 2017-06-12 22:03:20 +02:00
Brad King
3d00be13ee Android: Add support for unified headers
The unified headers are preferred as of NDK r15, so use them by default
if available and provide an option to use the deprecated headers.

Inspired-by: Florent Castelli <florent.castelli@gmail.com>
Fixes: #16584
2017-06-12 11:47:30 -04:00
Brad King
a131316a95 Merge branch 'android-standalone-no-sysroot-include' into release-3.9 2017-06-09 16:42:13 -04:00
Brad King
22f8a465d7 Android: Do not pass sysroot include for standalone toolchain
The change in commit v3.8.0-rc1~60^2 (Android: Pass sysroot include
directory explicitly, 2017-01-20) does not make sense when compiling
with a standalone toolchain which is tied to a single API version.
Drop the explicit include directory so that the compiler uses its
default system include order.

Fixes: #16954
2017-06-09 16:28:32 -04:00
Brad King
f83d3e3f2c Merge branch 'android-standalone-unified-api-level' into release-3.9 2017-06-09 14:20:09 -04:00
Brad King
5f93bf787d Android: Detect API version of standalone toolchain with unified headers
A standalone toolchain with unified headers keeps the `__ANDROID_API__`
macro in the `bin/clang` launcher instead of in `api-level.h`.

Issue: #16954
2017-06-09 14:19:52 -04:00
Brad King
522c92d752 FindDoxygen: Create imported targets at most once in a given scope
The imported targets added by commit v3.9.0-rc1~55^2 (Improve Doxygen
support, 2017-04-10) need to be guarded against duplicate creation on
multiple inclusion.
2017-06-09 10:03:26 -04:00
Konstantin Podsvirov
893ee1b17c FindDoxygen: Restore DOXYGEN_DOT_FOUND variable
The changes in commit v3.9.0-rc1~55^2 (Improve Doxygen support,
2017-04-10) accidentally dropped this variable from its compatibility
mode.
2017-06-07 12:51:06 -04:00
Brad King
2d3d88f3bb Merge topic 'GoogleTest-disabled-tests'
92bbb706 GoogleTest: Add support for disabled tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !920
2017-06-05 10:16:39 -04:00
Chuck Atkins
92bbb70695 GoogleTest: Add support for disabled tests
Fixes: #10612
2017-06-05 10:11:08 -04:00
Brad King
860db083ca Merge topic 'add-common-record-features-macros'
3c1ecb52 Intel: Fix missing C std default for 12.0 <= ver < 12.1
f70b0bb3 SunPro: Make sure all known versions get CXX98 defaults
220ede74 GNU: Fix language defaults for 3.4
a40e6ba8 Clang: Fix language defaults for 2.1
9b112a84 Compilers: Port to use default cmake_record_lang_compile_features macros
37221529 MSVC: Add empty definitions for std compile options
e556f1b9 CompileFeatures: Makes tests work with meta-feature only
20ffa147 Tests: Allow test macro to take no executable arguments
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !833
2017-06-01 13:40:47 -04:00
Chuck Atkins
3c1ecb5214 Intel: Fix missing C std default for 12.0 <= ver < 12.1 2017-05-31 13:09:49 -04:00
Chuck Atkins
f70b0bb365 SunPro: Make sure all known versions get CXX98 defaults 2017-05-31 13:09:42 -04:00
Silvio Traversaro
78841f27e3 FindGSL: recognize libraries name with debug postfix as debug libraries
This modification is necessary if the GSL libraries are installed
in an installation layout without Release and Debug subdirectories,
for example when installed by vcpkg .
2017-05-31 15:01:49 +02:00
Chuck Atkins
220ede74ff GNU: Fix language defaults for 3.4 2017-05-30 09:35:06 -04:00
Chuck Atkins
a40e6ba88d Clang: Fix language defaults for 2.1 2017-05-30 09:35:06 -04:00
Chuck Atkins
9b112a848a Compilers: Port to use default cmake_record_lang_compile_features macros 2017-05-30 09:34:36 -04:00
Chuck Atkins
37221529c7 MSVC: Add empty definitions for std compile options
There are no specific options for MSVC to set language standards, but
set them as empty strings anyways so the feature test infrastructure
can at least check to see if they are defined.
2017-05-29 13:51:54 -04:00
Chuck Atkins
5bb7429166 Compilers: Add default cmake_record_{c,cxx}_compile_features macros
Add default implementations for the cmake_record_lang_compile_features
macros.  All implementations of this are the same so it can be safely
factored out to a common implementation.
2017-05-29 12:33:42 -04:00
Brad King
d375618921 Merge topic 'sunpro-std-flags'
370d0d25 SunPro: update flags used for CMake itself
f1f21e30 SunPro: set -library=stlport as standard compile option for C++98
9316120c SunPro: add standard compile option for C++03
783fbb77 Tests: Compile entire Plugin test with the same language standard

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !879
2017-05-28 09:22:33 -04:00
Brad King
ff1563199c Merge topic 'intel-std-flags'
fc51b92c Intel: avoid variables in language standard flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !894
2017-05-28 09:21:43 -04:00
Brad King
f9ea6247c1 Merge topic 'FindBoost-use-IN_LIST'
cc329a01 FindBoost: Simplify search in lists.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !750
2017-05-28 09:12:04 -04:00
Brad King
5a0fa11fec Merge topic 'autogen_config'
e3e692ca Autogen: Test adaptions
dbda5906 Autogen: Per-config file suffixes. New AUTOGEN_BUILD_DIR target property.
0965002e Autogen: Pass build directory in Info file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !858
2017-05-28 09:11:33 -04:00
Brad King
8b96e31ca3 Merge topic 'FindProtobuf-export-macro'
1ee20192 FindProtobuf: add optional export declaration macro to generated cpp files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !881
2017-05-28 09:09:46 -04:00
Daniel Pfeifer
f1f21e3077 SunPro: set -library=stlport as standard compile option for C++98 2017-05-26 13:26:39 -04:00
Daniel Pfeifer
9316120c80 SunPro: add standard compile option for C++03 2017-05-26 13:26:39 -04:00
André Apitzsch
1ee2019239 FindProtobuf: add optional export declaration macro to generated cpp files 2017-05-26 11:35:03 -04:00
Alex Turbov
cc329a0125 FindBoost: Simplify search in lists.
Instead of `list(FIND...)` and then checking result for `-1`
(found/not-found), nowadays `if` command has the `IN_LIST` test for
that.
2017-05-26 11:21:49 -04:00
Brad King
6f74bbaffe Merge topic 'findxmlrpc_fix'
eb0cfd28 FindXMLRPC: handle QUIETLY and REQUIRED correctly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !887
2017-05-26 11:15:49 -04:00
Sebastian Holtermann
dbda590628 Autogen: Per-config file suffixes. New AUTOGEN_BUILD_DIR target property.
Closes #14760
Closes #14313
2017-05-26 15:27:17 +02:00
Sebastian Holtermann
0965002e57 Autogen: Pass build directory in Info file 2017-05-26 15:23:21 +02:00
Daniel Pfeifer
fc51b92c80 Intel: avoid variables in language standard flags
In the bootstrap script, we want to be able to extract language standard
flags using sed.  Make sure the content of the flag varianbles can be
passed unmodified to the compiler.
2017-05-26 08:21:50 +02:00
Niklas Simons
eb0cfd2847 FindXMLRPC: handle QUIETLY and REQUIRED correctly
Use the built in FindPackageHandleStandardArgs.

Fixes: #16912
Signed-off-by: Niklas Simons <nsimons@abo.fi>
2017-05-25 15:26:05 -04:00
Brad King
1f6509142d Merge topic 'FindCygwin-alt-arch'
d3034654 FindCygwin: Use find_program instead of find_path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !883
2017-05-25 15:15:16 -04:00
Brad King
def409af76 Merge topic 'FindDoxygen-add-docs-function'
59ffabfe Improve Doxygen support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !684
2017-05-25 15:14:53 -04:00
Brad King
d6df882add Merge topic 'find_dependency-improvements'
ab358d6a Improve find_dependency argument handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !872
2017-05-25 15:13:47 -04:00
Brad King
9f552e2e5a Merge topic 'vs15-GNUtoMS'
abe8a623 GNUtoMS: Add search path for VS 2017 environment scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !875
2017-05-24 10:37:51 -04:00
Brad King
20b892d9a2 Merge topic 'IAR-response-flag-space'
68ea936f Added space after IAR response file flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !880
2017-05-24 10:37:33 -04:00
Alex Turbov
59ffabfeec Improve Doxygen support
Except Graphviz's `dot` Doxygen may use few other utilities like
`mscgen` (Message Sequence Chart) and `dia` (Diagram Editor).

Now this module allows to manage Doxygen settings from `CMakeLists.txt`
and forget about `Doxyfile`s. Also it provides a helper function
to add a target to generate documentation: `doxygen_add_docs`.

Implement code review notes:

- Introduce `COMPONENTS` to find: `dot`, `mscgen` and `dia`;
- Deprecate variables `DOXYGEN_SKIP_DOT`, `DOXYGEN_EXECUTABLE`,
  `DOXYGEN_DOT_EXECUTABLE`, `DOXYGEN_DOT_FOUND` in favour of
  `doxygen_add_docs ` usage instead;
- Properly handle paths to found tools in Windows;
- Prevent adding a custom target if Doxygen was not really found;
- Introduce exported (executable) targets for found components.

Co-Author: Craig Scott <craig.scott@crascit.com>
2017-05-24 10:15:45 +07:00
Tibor Szabo
d303465448 FindCygwin: Use find_program instead of find_path
Cygwin's installation directory is mainly needed to use some programs
of it, irrespectively of the target architecture. However, find_path
does not consider cygwin with architecture different than the target
architecture. This is because cygwin's installation path is retrieved
from the registry. WOW64 view is not used by find_path if generating
for 32-bit architecture and vice versa, so cygwin is not found then.
find_program tries both views, this way a 64-bit cygwin may be used
for 32 bit build and vice versa.
2017-05-23 22:51:01 +02:00
Brad King
346f1c0cf3 Merge topic 'FindImageMagick-support-v7'
4131d1b5 FindImageMagick: Update to work with v7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !874
2017-05-23 13:30:23 -04:00
Andreas Weis
68ea936ff5 Added space after IAR response file flag
Without the space between the flag and the filename, IAR will fail to
parse the arguments correctly.
2017-05-23 07:25:27 +02:00
Alex Ghosh
abe8a623d9 GNUtoMS: Add search path for VS 2017 environment scripts
Use `cmake_host_system_information` to query the VS Installer tool for
the locations of VS versions since VS 2017 does not provide registry
entries anymore.  Add a loop to simplify addition of future versions.
2017-05-22 14:52:05 -04:00
Robert Dailey
4131d1b58e FindImageMagick: Update to work with v7 2017-05-22 12:54:31 -05:00
Matthew Woehlke
ab358d6a85 Improve find_dependency argument handling
Remove highly specialized and totally positional argument handling in
find_dependency macro, and instead just pass arguments through to
find_package. This gives users access to the full suite of arguments
that find_package knows, and is backward compatible with the old
arguments.

Also, rewrite the unit tests for this, since the old tests are
exclusively focused on testing the old argument handling and are no
longer applicable, and add some success tests (the old tests did not
even set up the CMake state in a way that CMake had any hope of ever
finding the test package).
2017-05-22 13:32:43 -04:00
Brad King
a5ccddf057 FindProtobuf: Rename imported targets to match upstream names
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>
2017-05-22 10:51:55 -04:00