mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
35,116 Commits 2 Branches 393 Tags
6ca4f2229234ab7543597ca19bda09c51297eee6
Commit Graph

7280 Commits

Author SHA1 Message Date
Brad King
82521e359f VS: Add support for determining CUDA compiler id 
Teach `CMakeDetermineCompilerId` how to generate a vcxproj file using
the `CMAKE_VS_PLATFORM_TOOLSET_CUDA`.
 2017-03-10 10:19:55 -05:00
Brad King
895b890466 VS: Add more placeholders to compiler id detection project file template 2017-03-10 10:19:54 -05:00
Brad King
a650dbb280 VS: Refactor compiler id detection project file template 
Make the `ClCompile` element name and `PostBuildEvent/Command` value
configurable.  Move the current content into default values for the
corresponding variables.
 2017-03-10 10:19:54 -05:00
Brad King
45ca6e739a Merge topic 'fix-static-assert' 
e2f25d3e WriteCompilerDetectionHeader: fix STATIC_ASSERT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !555
 2017-03-08 08:39:12 -05:00
Brad King
632534104c Merge topic 'cpack_nsis_sign_uninstaller' 
09475c29 CPack/NSIS: Sign the uninstaller

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !512
 2017-03-07 08:24:09 -05:00
Brad King
1e1cb41c46 Merge topic 'FindHDF5-lang-include-dirs' 
c6bef559 FindHDF5: set HDF5_<lang>_INCLUDE_DIRS in all cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !548
 2017-03-07 08:22:37 -05:00
Daniel Pfeifer
e2f25d3e82 WriteCompilerDetectionHeader: fix STATIC_ASSERT 
fixes #16185
 2017-03-06 20:52:09 +01:00
Brad King
8c5ed37e08 Merge topic 'FindVulkan-fix-win-32' 
723955cd FindVulkan: Fix for SDK versions < 1.0.42 on 32-bit Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !549
 2017-03-06 13:35:58 -05:00
Matthäus G. Chajdas
723955cd2b FindVulkan: Fix for SDK versions < 1.0.42 on 32-bit Windows 
Before Vulkan 1.0.42, the SDK would add the Bin directory to `PATH`,
which was confusing the 32-bit search on Windows.  Avoid such confusion
by ignoring the `PATH` when looking for the 32-bit version.

Vulkan 1.0.42 fixed the whole problem by moving the libraries into Lib,
Lib32, so this is strictly a compatibility fix for old SDKs.
 2017-03-06 13:32:41 -05:00
Kris Thielemans
c6bef559f3 FindHDF5: set HDF5_<lang>_INCLUDE_DIRS in all cases 
In the case that we're using `find_path` to find the include directory,
only the `_DIR` variable was set, while in all other cases only the
`_DIRS` variable was set.  Set the `_DIRS` variable in all cases (while
keeping `_DIR` as result of `find_path`).  Also document the `_DIRS`
variable.

Fixes: #16694
 2017-03-06 13:09:49 -05:00
Brad King
add3b1ee4f Merge topic 'FindHDF5-fix-definitions' 
ea2a8dd2 FindHDF5: Restore `-D` in HDF5_DEFINITIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !554
 2017-03-06 12:56:51 -05:00
Kris Thielemans
ea2a8dd268 FindHDF5: Restore -D in HDF5_DEFINITIONS 
Changes in commit v3.8.0-rc1~7^2~5 (FindHDF5: Fix command-line parsing
argument extraction order, 2017-02-02) accidentally dropped `-D` from
preprocessor definition flags extracted from the HDF5 compiler wrappers.

Fixes: #16693
 2017-03-06 12:48:49 -05:00
Brad King
2b52c6cde5 Merge topic 'FindJNI-archlinux-jvm-paths' 
d0ada3e2 FindJNI: Add jvm paths for Arch Linux
 2017-03-03 08:25:16 -05:00
Brad King
9f37f94d63 Merge branch 'FindJNI-archlinux-jvm-paths' into release 2017-03-03 08:16:10 -05:00
Kitsu
d0ada3e218 FindJNI: Add jvm paths for Arch Linux 2017-03-03 08:14:34 -05:00
Brad King
79b017f23c Merge topic 'FindVulkan-update' 
8e58f360 FindVulkan: Update for LunarG SDK import library location on Windows
 2017-03-03 07:57:33 -05:00
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
c1fb7213ed Merge topic 'autogen_uic_paths' 
3bf28f5e Autogen: New short InfoGet functions
154d8339 Autogen: Parse enabled feature configuration only
ac77fa35 Autogen: Add missing return on error
662ad240 Autogen: Rename and merge moc related methods
5adf22bb Autogen: Add AUTOUIC_SEARCH_PATHS release notes
36fa535d Autogen: Add AUTOUIC_SEARCH_PATHS documentation
6d7c02db Autogen: Add AUTOUIC_SEARCH_PATHS test
1cdf7c1b Autogen: Add AUTOUIC_SEARCH_PATHS support
110c1bf4 Autogen: Add subDirPrefix function
db431ecf Autogen: Merge FindInIncludeDirectories into FindIncludeFile
 2017-03-02 09:26:13 -05:00
Brad King
5d81817b71 Merge topic 'csproj_add_free_source_tags' 
506207f9 VS: add test for VS_CSHARP_* source file property
a202749c VS: add CSharpUtilities module
9588d0a2 VS: add VS_CSHARP_<tagname> sourcefile property
 2017-03-02 09:26:03 -05:00
Brad King
6d9ab1eff7 Merge topic 'FindHDF5-updates' 
2186b323 FindHDF5: initialize HDF5_DEFINITIONS when using hdf5-config.cmake
16f1dd0d FindHDF5: document HDF5_<LANG>_DEFINITIONS
b2de6da2 FindHDF5: use import libraries when using hdf5-config.cmake on Windows
003c9138 FindHDF5: do not cache library locations when using hdf5-config.cmake
bf67fff0 FindHDF5: recognize hdf5:: prefix when using hdf5-config.cmake
e629be4a FindHDF5: fix typo in comment
1c7a9119 FindHDF5: remove mark_as_advanced for non-cached variables
8250a520 FindHDF5: add HDF5_FIND_DEBUG variable to get debugging output
4b847f12 FindHDF5: hide HDF5_DIR if HDF5 was found in another way
 2017-03-02 09:25:59 -05:00
Sebastian Holtermann
3bf28f5ed0 Autogen: New short InfoGet functions 2017-03-02 09:10:03 -05:00
Sebastian Holtermann
1cdf7c1be2 Autogen: Add AUTOUIC_SEARCH_PATHS support 
Closes #15227
 2017-03-02 09:10:01 -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
Roman Wüger
09475c298b CPack/NSIS: Sign the uninstaller 2017-03-01 20:18:28 +01:00
Brad King
f782b31368 Merge topic 'FindPkgConfig-version-ops' 
8d71fa92 FindPkgConfig: use new version checking "library >= version" syntax
 2017-03-01 09:00:46 -05:00
Kris Thielemans
2186b323c0 FindHDF5: initialize HDF5_DEFINITIONS when using hdf5-config.cmake 2017-03-01 08:13:58 -05:00
Kris Thielemans
16f1dd0d16 FindHDF5: document HDF5_<LANG>_DEFINITIONS 2017-03-01 08:13:58 -05:00
Kris Thielemans
b2de6da2f1 FindHDF5: use import libraries when using hdf5-config.cmake on Windows 
The `LOCATION` of imported shared libraries on Windows is that of the
`.dll`.  Use the import library instead to get the `.lib` to be linked.

Fixes: #16534
 2017-03-01 08:12:56 -05:00
Kris Thielemans
003c91385a FindHDF5: do not cache library locations when using hdf5-config.cmake 
The imported targets provide a persistent reference of their location,
so we do not need to cache the values.
 2017-03-01 08:11:37 -05:00
Kris Thielemans
bf67fff035 FindHDF5: recognize hdf5:: prefix when using hdf5-config.cmake 
Some versions of HDF5 use this prefix on their imported targets.
 2017-03-01 08:11:22 -05:00
Kris Thielemans
e629be4a7a FindHDF5: fix typo in comment 2017-03-01 08:06:26 -05:00
Kris Thielemans
1c7a9119d2 FindHDF5: remove mark_as_advanced for non-cached variables 2017-03-01 08:06:26 -05:00
Kris Thielemans
8250a520aa FindHDF5: add HDF5_FIND_DEBUG variable to get debugging output 2017-02-28 16:10:11 -05:00
Kris Thielemans
4b847f12f6 FindHDF5: hide HDF5_DIR if HDF5 was found in another way 2017-02-28 16:01:04 -05:00
Gautier Pelloux-Prayer
8d71fa9283 FindPkgConfig: use new version checking "library >= version" syntax 
Instead of the deprecated --atleast-version one.
 2017-02-28 10:45:25 +01:00
Ben Boeckel
99d6de6c1a ExternalProject: only append COMMAND if actually adding a command 
Fixes #16544.
 2017-02-27 11:33:31 -05:00
Brad King
f79efeac79 Merge topic 'ExternalProject-checkout-clarify' 
a9fa6a2c ExternalProject: Run `git checkout` with `--` to clarify arguments
 2017-02-27 09:11:25 -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
fd14f87339 Merge topic 'GetPrerequisites-find_item_basename' 
eacf7dec GetPrerequisites: also try to resolve just the basename
 2017-02-24 09:31:41 -05:00
Brad King
0b0e28d30b Merge topic 'find_openmp_clang_patch' 
9dc7a2ed FindOpenMP: Add iomp5 variant of Clang OpenMP flags
 2017-02-24 09:31:30 -05:00
Brad King
31282e7854 Merge topic 'autogen_depends' 
62a1e292 Autogen: Add hint to SKIP_AUTOMOC in error message
e98465cf Autogen: Add Quote function and use it for logging
96f6f392 Autogen: Add AUTOMOC_DEPEND_FILTERS documentation
94e3f82c Autogen: Add AUTOMOC_DEPEND_FILTERS test
70ebf35c Autogen: Add AUTOMOC_DEPEND_FILTERS support
2a6fd432 Autogen: Single point of return in Run() method
e9a8a207 Autogen: Log simplifications
 2017-02-24 09:31:27 -05:00
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
Michael Maltese
eacf7decbf GetPrerequisites: also try to resolve just the basename 
Fixes #16625.
 2017-02-22 12:27:39 -08:00
Sebastian Holtermann
70ebf35cda Autogen: Add AUTOMOC_DEPEND_FILTERS support 2017-02-22 21:13:48 +01: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