Commit Graph

9021 Commits

Author SHA1 Message Date
Craig Scott
99a0a6d816 Merge topic 'bundle_fixes'
08be74bfd7 GetPrerequisites: Fix handling of executable scripts
52445300d6 GetPrerequisites: Allow prefixed tools
1bac4678ea GetPrerequisites: Add GET_PREREQUISITES_VERBOSE to set verbose
5072598f07 BundleUtilites: Don't use hardcoded name for install_name_tool
428680da92 GetPrerequisites: Don't use hardcoded name for otool

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2748
2019-01-06 15:05:32 -05:00
Alexander Grund
08be74bfd7 GetPrerequisites: Fix handling of executable scripts
Fixes: #18667
2019-01-05 09:09:39 +11:00
Marc Chevrier
e7a88ce482 Merge branch 'swig_src_file_ext' into 'master'
UseSWIG: Add support for custom Swig source file extensions

Closes #18727

See merge request cmake/cmake!2764
2019-01-04 05:16:41 -05:00
Thirumal Venkat
9816748847 SWIG: Add support for custom Swig source file extensions 2019-01-03 09:36:15 +05:30
Craig Scott
a7dcf130e9 Merge topic 'gtest-discovery-work-dir'
3bbf77fa01 Specify WORKING_DIRECTORY to execute_process() in GoogleTestAddTests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2761
2018-12-31 17:07:13 -05:00
Alexander Grund
52445300d6 GetPrerequisites: Allow prefixed tools
e.g. for cross-compilation with e.g. x86_64-pc-linux-gnu-ldd
2018-12-31 11:56:40 +11:00
Alexander Grund
1bac4678ea GetPrerequisites: Add GET_PREREQUISITES_VERBOSE to set verbose 2018-12-31 11:56:40 +11:00
Alexander Grund
5072598f07 BundleUtilites: Don't use hardcoded name for install_name_tool 2018-12-31 11:56:40 +11:00
Alexander Grund
428680da92 GetPrerequisites: Don't use hardcoded name for otool 2018-12-30 15:08:49 +01:00
Craig Scott
c79b98af37 Merge topic 'remove-include-cmakeparsearguments'
88b40744b5 CMakeParseArguments: Remove superfluous includes of CMakeParseArguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2744
2018-12-29 16:45:57 -05:00
Nehal J Wani
3bbf77fa01 Specify WORKING_DIRECTORY to execute_process() in GoogleTestAddTests 2018-12-28 17:44:51 +05:30
Craig Scott
d480ede35b Merge topic 'link-options'
f255280fd9 PIE link options: Update strategy to fix performance regression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2739
2018-12-23 17:23:11 -05:00
Craig Scott
91bcb88c3c Merge topic 'output-on-failure'
19d86e26e3 ExternalProject: add LOG_OUTPUT_ON_FAILURE option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2625
2018-12-21 16:21:47 -05:00
Wouter Klouwen
19d86e26e3 ExternalProject: add LOG_OUTPUT_ON_FAILURE option
This option only has an effect if at least one of the other LOG_<step>
options is enabled.  If an error occurs for a step which has logging to
file enabled, that step's output will be printed to the console.  For
cases where a large amount of output is recorded, just the end of that
output may be printed to the console.
2018-12-21 07:52:08 +11:00
Marc Chevrier
feafc7f3fe Help: FindLibLZMA: update formatting. 2018-12-20 15:26:51 +01:00
Marc Chevrier
0495ce4f98 Merge branch 'topic-findliblzma' into 'master'
FindLibLZMA: add imported target

Closes #18679 and #18680

See merge request cmake/cmake!2730
2018-12-20 06:17:35 -05:00
Marc Chevrier
f255280fd9 PIE link options: Update strategy to fix performance regression
Fixes: #18700
2018-12-19 19:41:27 +11:00
Kyle Edwards
88b40744b5 CMakeParseArguments: Remove superfluous includes of CMakeParseArguments
Because cmake_parse_arguments() has been implemented as a native
command, there is no need to include(CMakeParseArguments) anymore.
Its inclusion has been removed from several CMake modules.

Tests/CMakeOnly/CMakeLists.txt has been changed to include the
*building* CMake's copy of CMakeParseArguments rather than the
*built* CMake's copy. This file included the *built* copy because
when this file was introduced, CMake could still be built with versions
that didn't supply cmake_parse_arguments(). Now, CMake requires 3.1 or
greater, where cmake_parse_arguments() existed but was still in the
form of a module, so we include it from the *building* CMake.
2018-12-13 19:51:01 -05:00
Brad King
6589f67fb7 Merge topic 'UseJava-jar-depends'
5aa88f0e02 UseJava: add_jar: rebuild jar on dependencies changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2727
2018-12-13 10:02:14 -05:00
Hiroshi Miura
9644c835b3 FindLibLZMA: add imported target
- Add imported target LibLZMA::LibLZMA
- Show found message with library path
- Add test for FindLibLZMA

Fixes: #18680, #18679

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2018-12-13 09:40:11 +09:00
Brad King
a23ac516b3 Merge topic 'machoFormat'
c86e82c092 Add Mach-O CMAKE_EXECUTABLE_FORMAT detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2722
2018-12-12 08:25:04 -05:00
Brad King
4a5e003d4c Merge topic 'FindThreads-drop-irix'
83dab0c123 FindThreads: Drop IRIX-specific options and results

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2717
2018-12-12 08:24:10 -05:00
Marc Chevrier
5aa88f0e02 UseJava: add_jar: rebuild jar on dependencies changes
Fixes: #18683
2018-12-11 15:17:24 +01:00
Maikel van den Hurk
c86e82c092 Add Mach-O CMAKE_EXECUTABLE_FORMAT detection
Code for this was prototyped when ELF detection was added long ago but
left commented out.  Use either MH_MAGIC or MH_CIGAM for the 32-bit
variant and use either or MH_MAGIC_64 or MH_CIGAM_64 for the 64-bit
variant.
2018-12-10 14:41:42 -05:00
Brad King
d3983f7fc6 Merge topic 'SWIG'
dff28141dc UseSWIG: add management of SWIG option -module
7b3d4799f8 Help: update policy 0078 documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2669
2018-12-10 08:23:42 -05:00
Brad King
45c5958e36 Merge topic 'cuda-arch-turing'
0f9533e61b CUDA: Add CUDA 10 (Turing) detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Henry Schreiner <henryschreineriii@gmail.com>
Merge-request: !2702
2018-12-10 08:22:20 -05:00
Brad King
83dab0c123 FindThreads: Drop IRIX-specific options and results
We do not need to support IRIX anymore, so drop relevant parts.  In
particular, the `CMAKE_THREAD_PREFER_PTHREAD` is frequently confused
with `THREADS_PREFER_PTHREAD_FLAG`.

Also remove references to the IRIX-specific options and results
from other modules and tests.
2018-12-07 13:33:01 -05:00
Marc Chevrier
dff28141dc UseSWIG: add management of SWIG option -module
When file property SWIG_MODULE_NAME is specified, provide option -module
to SWIG compiler.

Fixes: #18374
2018-12-07 18:51:57 +01:00
Anton Chernov
0f9533e61b CUDA: Add CUDA 10 (Turing) detection 2018-12-07 08:51:57 -05:00
Brad King
ce1ac9b92d Merge topic 'gnu-octave'
170bcb6fdc FindOctave: Add module to find GNU octave

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2630
2018-12-07 08:35:37 -05:00
Brad King
2d402239c7 Merge topic 'submit-method'
9501a6145d CTest: Remove special case for Dart version <= 1
e184603378 CTest: Add release note about removed submission methods
8c25aa2feb CTest: Remove submission trigger
a688c6b928 CTest: Remove submit method 'ftp'
c339b64cf2 CTest: Remove submit method 'scp'
aebdad399e CTest: Remove submit method 'cp'
c2f6872c4e CTest: Remove submit method 'xmlrpc'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2672
2018-12-07 08:33:46 -05:00
Brad King
05f1d7a462 Merge topic 'FindCURL-components'
5085a984e1 Help: Add notes for topic 'FindCURL-components'
8e5db11fd9 FindCURL: add test for component
fc5afbe970 FindCURL: support COMPONENTS to check features

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2677
2018-12-07 08:31:37 -05:00
Brad King
3454edcd19 Merge topic 'FindHDF5-static-hl'
4e174e0960 FindHDF5: Fix search for static hdf5_hl on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2700
2018-12-07 08:29:27 -05:00
Brad King
fdd09a0269 Merge topic 'qnx_compiler_detection'
243b7c40d4 QNX: Compiler and feature detection fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: MvdHurk <maikelvandenhurk@hotmail.com>
Merge-request: !2699
2018-12-07 08:28:13 -05:00
Brad King
e6af2f3d2e Merge topic 'UseEcos-append-flags'
620e4e5e21 UseEcos: Append C and CXX flags instead of overwriting them

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2684
2018-12-07 08:26:42 -05:00
Brad King
5651bb0878 Merge topic 'FindThreads-asan'
e9a1ddc594 FindThreads: Replace the pthread symbol checking in libc.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2629
2018-12-07 08:25:39 -05:00
Michael Hirsch, Ph.D
170bcb6fdc FindOctave: Add module to find GNU octave 2018-12-06 14:16:44 -05:00
Hiroshi Miura
fc5afbe970 FindCURL: support COMPONENTS to check features
- Use pkg-config or curl-config to retrieve version,
  supported features and protocols.
- Support optional COMPONENTS to check supported features

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2018-12-06 11:49:04 -05:00
Mouginot B
4e174e0960 FindHDF5: Fix search for static hdf5_hl on Windows
The change in commit v3.10.0-rc1~411^2~1 (FindHDF5: Add support for
HDF5_USE_STATIC_LIBRARIES on Windows, 2017-07-03) accidentally left
out a `lib` prefix on the static library name of `hdf5_hl`.  It was
done correctly already for the main `hdf5` library.
2018-12-06 10:43:29 -05:00
antmak
620e4e5e21 UseEcos: Append C and CXX flags instead of overwriting them 2018-12-06 09:49:28 -05:00
Brad King
d0e371f516 Merge topic 'try-compile'
f266182aec Check* functions family: add support for LINK_OPTIONS
29f9db5c63 try_compile/try_run: Add support for LINK_OPTIONS option.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2661
2018-12-06 09:03:58 -05:00
Brad King
0464298956 Merge topic 'arch-independent-version-file-creation'
eb973f935f CMakePackageConfigHelpers: Add ARCH_INDEPENDENT option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Silvio Traversaro <pegua1@gmail.com>
Merge-request: !2666
2018-12-06 09:00:58 -05:00
Cristian Adam
243b7c40d4 QNX: Compiler and feature detection fixes
Tested compiler detection with the QNX 7.0 list of compiler targets:
 * gcc_ntoaarch64le
 * gcc_ntoaarch64le_cxx
 * gcc_ntoarmv7le
 * gcc_ntoarmv7le_cxx
 * gcc_ntox86_cxx
 * gcc_ntoaarch64le_gpp
 * gcc_ntox86_64_gpp
 * gcc_ntoarmv7le_gpp
 * gcc_ntox86_64_cxx
 * gcc_ntox86
 * gcc_ntox86_gpp
 * gcc_ntox86_64

This commit fixes some of the problems described in:
https://cristianadam.eu/20181202/a-better-qnx-cmake-toolchain-file/
2018-12-03 23:18:43 +01:00
JerryShih
e9a1ddc594 FindThreads: Replace the pthread symbol checking in libc.
With asan build, we will have the pthread_create() symbol in libc. However,
libasan doesn't have full pthread implementation. We can't assume that we
have the pthread implementation in libc using pthread_create() symbol.
Replace the pthread_create() with pthread_kill() as a quick fix.
2018-12-03 16:05:59 +08:00
Marc Chevrier
f266182aec Check* functions family: add support for LINK_OPTIONS
Fixes: #18521
2018-12-01 17:56:23 +01:00
Justin Bassett
eb973f935f CMakePackageConfigHelpers: Add ARCH_INDEPENDENT option
Allow skipping the architecture check in the package version file generated from calling
write_basic_package_version_file. Document said architecture check.

Fixes: #16184
2018-11-30 22:52:40 -08:00
Regina Pfeifer
9501a6145d CTest: Remove special case for Dart version <= 1 2018-11-29 00:29:13 +01:00
Regina Pfeifer
8c25aa2feb CTest: Remove submission trigger 2018-11-29 00:29:13 +01:00
Regina Pfeifer
c339b64cf2 CTest: Remove submit method 'scp' 2018-11-29 00:29:13 +01:00
Guillem Jover
38e75bb3c6 CPack/Deb: Remove paxr as a supported tar format for a .deb
The only format supported from the ones available within cpack is
gnutar, which supports large numbers encoded in base-256, and long
filenames and linknames. PAX is not and has never been a supported
format by dpkg.

Fixes: #18620
2018-11-28 09:31:28 -05:00