Commit Graph

7198 Commits

Author SHA1 Message Date
Brad King
3e06cdc19b Merge branch 'FindVulkan-update' into release 2017-03-02 10:03:57 -05:00
Brad Davis
8e58f360f5 FindVulkan: Update for LunarG SDK import library location on Windows
As of at least 1.0.42 of the LunarG SDK, the `vulkan-1.lib` import
library on Windows is stored in `${VULKAN_SDK}/Lib` or
`${VULKAN_SDK}/Lib32`.
2017-03-02 10:02:20 -05:00
Brad King
fce6233d8b Merge branch 'csproj_add_free_source_tags' into release 2017-03-02 08:38:16 -05:00
Michael Stürmer
a202749c46 VS: add CSharpUtilities module 2017-03-01 15:31:05 -05:00
Brad King
dab2ff3e23 Merge branch 'ExternalProject-checkout-clarify' into release 2017-02-24 13:22:45 -05:00
Brad King
a9fa6a2c77 ExternalProject: Run git checkout with -- to clarify arguments
Fix the case when the tag name to be checked out also happens to match a
path name.

Fixes: #16678
2017-02-24 13:22:40 -05:00
Brad King
4734c3e6db Merge branch 'FindCUDA-fix-init' into release 2017-02-22 10:35:55 -05:00
Bjoern Thiel
934eb497f2 FindCUDA: Fix PTX selection with multiple architectures 2017-02-22 10:35:44 -05:00
Brad King
fe8f5b54f5 Merge branch 'ExternalProject-update-docs' into release 2017-02-21 11:11:27 -05:00
Brad King
0b6afec62b Merge branch 'FindGTK2-old-sigc++' into release 2017-02-21 11:11:13 -05:00
Brad King
c95d017f9c ExternalProject: Clarify documented role of INSTALL_DIR
It does not actually configure the project to install to the given
location.  That must be done by passing the `<INSTALL_DIR>` placeholder
to the external project configuration step.
2017-02-21 10:32:26 -05:00
Wilfried Goesgens
4b21290e20 ExternalProject: Clarify documented role of INSTALL_COMMAND
It is for the install step of the external project and does not
affect installation of the calling project.
2017-02-21 10:32:25 -05:00
Ben Boeckel
2ab118a859 FindGTK2: handle old libsigc++ versions
Old versions of `libsigc++` do not have the version macros inside of its
`sigc++config.h` header. Assume nothing about such headers and report
version "zero".

Fixes: #16654
2017-02-20 11:58:57 -05:00
Brad King
2cffea3c72 Merge branch 'FindHDF5-fix-header-langs' into release 2017-02-17 09:28:48 -05:00
Brad King
96d6139386 FindHDF5: Fix search for language-specific header file
Refactoring in commit v3.6.0-rc1~85^2 (HDF5: Refactor the use of
compiler wrappers, 2016-04-04) converted code of the form

    if(${LANGUAGE} MATCHES ...)

to

    if(LANGUAGE MATCHES ...)

However, `LANGUAGE` is a foreach() loop variable and not a normal
variable so auto-dereference does not occur.  Restore the explicit `${}`
syntax and use the new name of the loop variable that has changed since
then too.

Fixes: #16651
2017-02-17 09:25:46 -05:00
Brad King
28bb68e347 FindHDF5: Restore HDF5_<LANG>_INCLUDE_DIR advanced cache entry mark
Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching
to correctly find HL for all bindings, 2016-05-12) renamed the language
loop variable used to construct the name of `HDF5_<LANG>_INCLUDE_DIR`
but forgot to update it in the `mark_as_advanced` call.  Fix it now.

Issue: #16651
2017-02-17 09:10:03 -05:00
Brad King
55fb46d273 CUDA: Fix default compiler flags on Windows
Fix the default values of `CMAKE_CUDA_FLAGS[_<CONFIG>]` on Windows to
make the host compiler flags match those produced for C++ by the
`Platform/Windows-MSVC` module.  This makes the flags consistent with
those used for C++.
2017-02-15 11:12:12 -05:00
Brad King
272c348d5a Merge branch 'cuda-no-Os' into release 2017-02-14 15:25:23 -05:00
Brad King
59ed323d46 CUDA: Do not use non-existent -Os flag for nvcc
Fix the CUDA MinSizeRel configuration flags to avoid using the `-Os`
flag that nvcc does not support.
2017-02-14 14:49:53 -05:00
Brad King
81ebf4be3e Merge branch 'cuda-with-c' into release 2017-02-14 10:47:01 -05:00
Brad King
1c60231ca5 CUDA: Link to standard system libraries when linking as CUDA
On Windows with MSVC-like host compilers we must honor the standard
libraries chosen by the `Platform/Windows-MSVC` module.  Otherwise C
code linked into the CUDA binary that expects to have these libraries
available may not link.
2017-02-14 10:34:15 -05:00
Brad King
f45e3b9509 Merge branch 'backport-clang-format-cuda' into release 2017-02-14 10:22:43 -05:00
Brad King
0b2f8ae3ba Modules: Run clang-format on CUDA code 2017-02-14 10:20:42 -05:00
Brad King
bcd28f04b1 Merge branch 'cmake_provide_include_dir_for_toolkit' into release 2017-02-13 11:45:07 -05:00
Robert Maynard
44f3acb202 CUDA: Detect the toolkit include directories
The `nvcc -v` output provides what include directories need to be added
to use the CUDA toolkit from other languages ( C/C++ ).
2017-02-10 16:08:06 -05:00
Brad King
6cbad490c2 Merge branch 'sphinx-1.4' into release 2017-02-10 11:32:04 -05:00
Brad King
30abf145fd Help: Fix cmake code block warnings produced by Sphinx 1.4
Some of our "cmake" code blocks do not use fully valid CMake syntax
because they have placeholders for human reference.  Sphinx has
never been able to properly lex and highlight these, but now warns.
Fix each block's syntax or change to a non-cmake block as appropriate.
2017-02-10 10:43:30 -05:00
Daniele E. Domenichelli
6cffc98ca0 FeatureSummary: Fix documentation 2017-02-06 14:35:30 -05:00
Brad King
cf1bc84216 Merge topic 'productbuild_signing'
48aad9cd CPackProductBuild: Add options to sign packages
2017-02-06 10:29:44 -05:00
Brad King
a4c8ad5ed8 Merge topic 'androidtestutilities_cleanup'
8a5cb84b AndroidTestUtilities: do not require ExternalData unconditionally
9d34e51c AndroidTestUtilities: ignore exit status of ls
2017-02-06 10:29:40 -05:00
Brad King
59c50a1d3c Merge topic 'FindHDF5-fix-HDF5_ROOT'
cf0d8f1f FindHDF5: Restore HDF5_INCLUDE_DIR in all code paths
5564c017 FindHDF5: Restore fallback to static libraries
4908969f FindHDF5: Fix search with HDF5_ROOT
77f6d22a FindHDF5: Use keywords in find_library calls
3d5ad723 FindHDF5: Initialize/finalize internal search options variable
ae89967f FindHDF5: Fix command-line parsing argument extraction order
2017-02-06 10:29:38 -05:00
Brad King
8e8eeb73ab Merge topic 'findmpi-flags-fix'
a2a73935 FindMPI: Remove leading spaces from flags
93f29be2 FindMPI: Reset MPI_INCLUDE_PATH_WORK before use
2017-02-06 10:29:35 -05:00
Zack Galbreath
8a5cb84b0e AndroidTestUtilities: do not require ExternalData unconditionally
Attempting to use AndroidTestUtilities to simply install some local
files on device can result in the following error:

    Neither ExternalData_URL_TEMPLATES nor ExternalData_OBJECT_STORES is set

We no longer require these ExternalData-specific variables to be set if
no such remote data files are requested.

Fixes: #16529
2017-02-04 08:16:24 -05:00
Roman Wüger
48aad9cda0 CPackProductBuild: Add options to sign packages 2017-02-04 08:07:48 -05:00
Zack Galbreath
9d34e51cdb AndroidTestUtilities: ignore exit status of ls
adb used to suffer from a bug where `adb shell` would return 0 irrespective
the exit status of the underlying process that it executed.  This is now
fixed for newer versions of Android (N+).

As a result, attempting to `adb shell ls` a nonexistent file can now result
in a non-zero exit status.  Updating check_device_file_exists to ignore the
exit status of `adb shell` fixes this bug for newer Android devices.
2017-02-03 13:22:36 -05:00
Brad King
cf0d8f1fd6 FindHDF5: Restore HDF5_INCLUDE_DIR in all code paths
This compatibility variable should be set no matter which method was
used to find HDF5.  Even if `HDF5_INCLUDE_DIRS` was set by copying the
`HDF5_INCLUDE_DIR` value from `hdf5-config.cmake` it will not hurt to
copy the same value back.

Issue: #16566
2017-02-03 10:57:10 -05:00
Brad King
5564c01703 FindHDF5: Restore fallback to static libraries
Since commit v3.6.1~6^2~2 (FindHDF5: Fix h5cc arg parsing to work with
homebrew on Mac, 2016-07-11) we treated `HDF5_USE_STATIC_LIBRARIES` OFF
as a requirement for shared libraries.  It is just supposed to be a
preference.  Even if `HDF5_USE_STATIC_LIBRARIES` is not set we should
still fall back to finding static libraries if shared libraries are not
available.

Issue: #16566
2017-02-03 09:12:06 -05:00
Brad King
4908969f57 FindHDF5: Fix search with HDF5_ROOT
Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching
to correctly find HL for all bindings, 2016-05-12) turned off a large
amount of its logic when HDF5_ROOT is set.  This caused use of the hdf5
compiler wrapper to extract all needed libraries (e.g. z, dl as
dependencies of hdf5 static libraries) to be skipped when using
HDF5_ROOT.

Fix the search logic to honor HDF5_ROOT in all code paths.  Restrict the
search for hdf5-specific components to this root, but allow external
libraries to be found anywhere.

Fixes: #16566
2017-02-03 09:12:05 -05:00
Brad King
77f6d22ad1 FindHDF5: Use keywords in find_library calls
Clarify the purpose of each argument.
2017-02-03 09:12:05 -05:00
Brad King
3d5ad7236c FindHDF5: Initialize/finalize internal search options variable
While at it, use a more private name.
2017-02-03 09:12:05 -05:00
Brad King
ae89967f9d FindHDF5: Fix command-line parsing argument extraction order
Re-implement our internal `_HDF5_parse_compile_line` helper to process
command line arguments all at once and in order.  Otherwise the
libraries named by absolute path and those named by `-l` arguments are
not kept in order.

The new implementation will not handle separate arguments like
`-I /path/to/include/dir` but I have not seen the HDF5 compiler
wrappers produce this form.  If necessary the parsing loop can
be extended with a state variable to keep track of such pairs.
2017-02-03 09:12:04 -05:00
Rolf Eike Beer
37ed860ad1 GNU C++: record that -fvisibility-inlines-hidden is available since 4.0
See https://gcc.gnu.org/onlinedocs/gcc-4.0.0/gcc/Option-Summary.html
2017-02-02 18:28:56 +01:00
Rolf Eike Beer
94a8ee6fd0 GNU C: record that C99 is available since at least 3.4 2017-02-02 18:28:56 +01:00
Brad King
2b0256c5ad Merge topic 'find_cuda_fix_typo'
645dd3ca FindCUDA: Fix typo in CUDA_DETECT_INSTALLED_GPUS doc string
2017-02-02 08:55:31 -05:00
Pierre Moreau
645dd3ca53 FindCUDA: Fix typo in CUDA_DETECT_INSTALLED_GPUS doc string 2017-02-02 08:52:11 -05:00
Brad King
aba66d27a1 Merge topic 'FindGSL-regex-fixup'
88c4576b FindGSL: Fix gl_version.h extraction regex
2017-02-02 08:39:32 -05:00
Christian Pfeiffer
a2a73935b2 FindMPI: Remove leading spaces from flags 2017-02-02 11:31:22 +01:00
Igor Peschinskiy
88c4576be4 FindGSL: Fix gl_version.h extraction regex
Fix the regex to match versions with only two digits, such as `2.3`.
2017-02-01 13:47:37 -05:00
Christian Pfeiffer
93f29be231 FindMPI: Reset MPI_INCLUDE_PATH_WORK before use 2017-02-01 18:45:13 +01:00
Brad King
6f2e2c74ba Merge topic 'WCDH_allow_unsupported'
1679fecb CompileFeatures Test: make sure the target "CompileFeatures" is always defined
98e6d1e5 Tests/Module/WCDH: make it work with only C features defined
c8703e9d WCDH: optionally omit error code for unknown compilers or compiler versions
0de9c398 WCDH: add macro to write simple replacement defines
2017-02-01 09:21:44 -05:00