Commit Graph

7230 Commits

Author SHA1 Message Date
Lucas Czech 9dc7a2ed2c FindOpenMP: Add iomp5 variant of Clang OpenMP flags
Try `-fopenmp=libiomp5` in addition to `-fopenmp=libomp`.  Leave the
latter as the default that we try first when the compiler id is `Clang`.
If that does not work we will still fall back to trying all the
candidates and eventually get to the iomp5 variant.
2017-02-23 09:59:46 -05:00
Brad King e68aad3eb8 Merge topic 'FindCUDA-fix-init'
934eb497 FindCUDA: Fix PTX selection with multiple architectures
2017-02-23 07:35:29 -05:00
Bjoern Thiel 934eb497f2 FindCUDA: Fix PTX selection with multiple architectures 2017-02-22 10:35:44 -05:00
Brad King dfebdd6218 Merge topic 'autogen_json'
29d96633 Autogen: Don't use .moc include in Q_PLUGIN_METADATA test
d60f1ddc Autogen: Documentation update
cdb72127 Autogen: Add release notes for Q_PLUGIN_METADATA support
8b13a52c Autogen: Tests: Set different compression levels in rcc test
9d1db7d7 Autogen: Overhaul and simplify AutogenInfo.cmake file generation
0ab817fa Autogen: Optimize GetCompileDefinitionsAndDirectories function
754d4318 Autogen: Sort AutogenInfo.cmake.in
cd74daf0 Autogen: Tests: Add Q_PLUGIN_METADATA test
39c4819e Autogen: Tests: Add moc include tests
50805693 Autogen: Tests: Clean comments
c23206b6 Autogen: Log simplifications
347572cf Autogen: Only touch an unchanged moc_compilation.cpp
03df033b Autogen: Rebuild moc when Q_PLUGIN_METADATA json file changes
3ec230de Autogen: Use GetRealPath in central places only
41fb64e7 Autogen: Search moc includes in include directories
175c8900 Autogen: Sort includes before composing include options
...
2017-02-22 10:15:48 -05:00
Brad King 8aac0ae7c5 Merge topic 'ExternalProject-update-docs'
c95d017f ExternalProject: Clarify documented role of `INSTALL_DIR`
4b21290e ExternalProject: Clarify documented role of `INSTALL_COMMAND`
2017-02-22 10:15:29 -05:00
Brad King 3ccad39000 Merge topic 'cmake-host-system-name'
717e1f30 Use looked up uname path for command execution
0bbd993f Make CMAKE_HOST_SYSTEM_NAME available in scripting context
2017-02-21 11:14:03 -05:00
Brad King f5d6d27168 Merge topic 'FindGTK2-old-sigc++'
2ab118a8 FindGTK2: handle old libsigc++ versions
2017-02-21 11:14:01 -05:00
Sebastian Holtermann 9d1db7d7c3 Autogen: Overhaul and simplify AutogenInfo.cmake file generation 2017-02-21 10:38:50 -05:00
Sebastian Holtermann 754d431813 Autogen: Sort AutogenInfo.cmake.in
Also rename AM_SKIP_MOC to AM_MOC_SKIP
and AM_SKIP_UIC to AM_UIC_SKIP
2017-02-21 10:38:49 -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 66094d1224 Merge topic 'productbuild_component_plist'
d32f9deb CPack: Add option to specify --component-plist for productbuild
2017-02-20 10:43:05 -05:00
Brad King 5d17b68c67 Merge topic 'productbuild_resources'
734581f4 CPack: Add support for CPACK_PRODUCTBULID_RESOURCES_DIR
2017-02-20 10:43:02 -05:00
Gregor Jasny 717e1f3056 Use looked up uname path for command execution 2017-02-19 19:27:34 +01:00
Gregor Jasny 0bbd993f61 Make CMAKE_HOST_SYSTEM_NAME available in scripting context 2017-02-19 19:27:34 +01:00
Tim Hutt 734581f49f CPack: Add support for CPACK_PRODUCTBULID_RESOURCES_DIR
This allows you to copy custom files (e.g. a background image) into the
macOS installer.

Fixes: #16604
2017-02-17 11:47:00 -05:00
Tim Hutt d32f9debc8 CPack: Add option to specify --component-plist for productbuild
When using the productbuild generator this lets you specify the value of
the `--component-plist` parameter when it runs pkgbuild for a component.

Fixes: #16638
2017-02-17 11:40:45 -05:00
Brad King dbdd25bc95 Merge topic 'FindHDF5-fix-header-langs'
96d61393 FindHDF5: Fix search for language-specific header file
2017-02-17 09:32:57 -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 c58b0926a7 Merge topic 'FindHDF5-include-dir-advanced'
28bb68e3 FindHDF5: Restore HDF5_<LANG>_INCLUDE_DIR advanced cache entry mark
2017-02-17 09:18:44 -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 5febec7a4b Merge topic 'FindOpenSSL-crypto-name'
9b78dca3 FindOpenSSL: Add another name for libcrypto with MSVC
2017-02-17 08:46:03 -05:00
Kevin Whitaker 9b78dca3a9 FindOpenSSL: Add another name for libcrypto with MSVC
Add the `crypto` name without any prefix or suffix as a fallback, just
as we already have for `ssl`.
2017-02-16 13:26:42 -05:00
Brad King fb3fd78d58 Merge topic 'TestBigEndian-cxx-only'
ac0962ce TestBigEndian: Fix to work with CXX without C
2017-02-16 13:15:47 -05:00
Brad King d1530cc9a5 Merge topic 'cuda-msvc-flags'
55fb46d2 CUDA: Fix default compiler flags on Windows
d7c80f60 CUDA: Fix test cases to not override CUDA flags
2017-02-16 13:15:35 -05:00
Uwe Koloska ac0962cead TestBigEndian: Fix to work with CXX without C 2017-02-15 15:08:37 -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 99ca1e27e2 Merge topic 'cuda-drop-comment'
7c29a0c8 CMakeDetermineCUDACompiler: Drop out-of-date comment
2017-02-15 08:24:07 -05:00
Brad King e853dfed6a Merge topic 'cuda-with-c'
1c60231c CUDA: Link to standard system libraries when linking as CUDA
8d75d8dc Tests: Add case for CUDA with C but not C++
2017-02-15 08:24:05 -05:00
Brad King 8ba5c21db7 Merge topic 'cuda-no-Os'
59ed323d CUDA: Do not use non-existent -Os flag for nvcc
2017-02-15 08:24:02 -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 7c29a0c860 CMakeDetermineCUDACompiler: Drop out-of-date comment 2017-02-14 13:40:20 -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 fa5188d0ed Merge branch 'backport-clang-format-cuda' into clang-format-cuda 2017-02-14 10:21:22 -05:00
Brad King 0b2f8ae3ba Modules: Run clang-format on CUDA code 2017-02-14 10:20:42 -05:00
Brad King b7d8d80a62 Merge topic 'cmake_provide_include_dir_for_toolkit'
44f3acb2 CUDA: Detect the toolkit include directories
2017-02-14 08:30:30 -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 ee3295e917 Merge topic 'vs-nasm'
5ba2c9e5 VS: Add support for ASM_NASM language
2017-02-10 13:36:18 -05:00
Brad King 0a30938848 Merge topic 'ExtractGTestMacro'
9837ed96 GoogleTest: Add module to contain gtest_add_tests independently
2017-02-10 13:36:14 -05:00
Brad King f236c9cff9 Merge topic 'gcc-cpp98'
e2ee0971 g++ knows about C++98 selection flags since at least 3.4
2017-02-10 13:36:09 -05:00
Brad King 46c6489850 Merge topic 'sphinx-1.4'
30abf145 Help: Fix cmake code block warnings produced by Sphinx 1.4
97917900 Utilities/Sphinx: Port qthelp css workaround to Sphinx 1.4
971384c2 Utilities/Sphinx: Port cmake extension to Sphinx 1.4
2017-02-10 11:32:21 -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
Rolf Eike Beer e2ee097147 g++ knows about C++98 selection flags since at least 3.4
https://gcc.gnu.org/onlinedocs/gcc-3.4.0/gcc/C-Dialect-Options.html#C-Dialect-Options
2017-02-08 21:04:31 +01:00
Evgeny Fimochkin 5ba2c9e5e0 VS: Add support for ASM_NASM language
Fixes: #16469
2017-02-07 13:20:52 -05:00