Commit Graph

33990 Commits

Author SHA1 Message Date
Michael Stürmer 66bd8a3cf2 cmVisualStudio10TargetGenerator: Prepare to handle C# projects
Generalize some internal infrastructure to prepare for generating
either `.vcxproj` or `.csproj` files.

- Add member string for project file extension
- Add member enum for project type
- Add member flag for in-source build
- Add member flag for managed build
- Rename PathToVcxproj to PathToProjectFile
2016-12-01 10:36:43 -05:00
Kitware Robot 7b6f6d9e67 CMake Nightly Date Stamp 2016-12-01 00:01:08 -05:00
Brad King f2035cbd0d Merge branch 'release' 2016-11-30 11:17:34 -05:00
Brad King db3499df5d CMake 3.7.1 v3.7.1 2016-11-30 09:54:05 -05:00
Brad King afe7d5f26d Merge branch 'release' 2016-11-30 08:38:58 -05:00
Brad King 12823faa72 Merge topic 'CMakeGraphVizOptions-docs'
f7c2a803 CMakeGraphVizOptions: Minor improvements to docs.
2016-11-30 08:37:41 -05:00
Brad King 29b37dd975 Merge topic 'msbuild-customization'
e3909918 VS: Add option to customize vcxproj user props file
2016-11-30 08:37:37 -05:00
Brad King a53a2f1e7e Merge topic 'FindPythonLibs-tolerate-relative-exe'
9db0dfd7 FindPythonLibs: Tolerate a non-absolute PYTHON_EXECUTABLE
2016-11-30 08:37:34 -05:00
Brad King 2036639b55 Merge topic 'cpack-ifw-options'
88ecfd8b CPackIFW: Add some options
2016-11-30 08:37:30 -05:00
Brad King 8cdf566bc0 Merge topic 'QtAutogen_tests_update_v2'
6938772a QtAutogen tests: Pass Qt compiler features to library targets
c4d4becf QtAutogen tests: Move the complex test case to a subdirectory
2599f5d6 QtAutogen tests: Extend test description in CMakeLists.txt
7052af9d QtAutogen tests: Move independent sameName test to top list of CMakeLists.txt
d675004d QtAutogen tests: Rename uiconly target to camel case uicOnly
cb4bc19a QtAutogen tests: Rename rcc_empty target to camel case rccEmpty
59dbd3f8 QtAutogen tests: Rename rcconly target to camel case rccOnly.
2016-11-30 08:37:26 -05:00
Brad King 32e95a7b24 Merge topic 'end-commands'
67303794 Combine all unexpected commands to a single class
d23a0196 Set the error after argument expansion in end commands
1afbe7d2 Make error message of standalone endwhile command consistent
2016-11-30 08:37:22 -05:00
Brad King d5ab04f065 Merge topic 'UseSWIG-java-outputs'
62c4cb4b UseSWIG: Record generated java files as custom command outputs
2016-11-30 08:37:18 -05:00
Brad King 8224545b1d Merge topic 'update-kwsys'
8bced8b1 Merge branch 'upstream-KWSys' into update-kwsys
cd5cff13 KWSys 2016-11-28 (1c7c2139)
2016-11-30 08:37:15 -05:00
Brad King 4288708cba Merge topic 'vs15-rename-generator-for-master'
31e013ae Merge branch 'vs15-rename-generator' into vs15-rename-generator-for-master
d639620e VS: Rename VS 15 generator to 'Visual Studio 15 2017'
2016-11-30 08:37:11 -05:00
Kitware Robot 996e5237ca CMake Nightly Date Stamp 2016-11-30 00:01:04 -05:00
Daniel Pfeifer 67303794f0 Combine all unexpected commands to a single class 2016-11-29 13:53:29 -05:00
Daniel Pfeifer d23a019684 Set the error after argument expansion in end commands
The current code is optimized for rare error cases.  Simplify the code
and remove these optimizations.
2016-11-29 13:53:29 -05:00
Daniel Pfeifer 1afbe7d2cc Make error message of standalone endwhile command consistent
with the error messages of endforeach, endmacro, endfunction, etc.
2016-11-29 13:53:29 -05:00
Sebastian Holtermann 6938772a11 QtAutogen tests: Pass Qt compiler features to library targets 2016-11-29 18:46:39 +01:00
Brad King 8bced8b18d Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-11-28 (1c7c2139)
2016-11-29 11:49:34 -05:00
KWSys Upstream cd5cff1337 KWSys 2016-11-28 (1c7c2139)
Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 1c7c2139e773124c0a2b80e10b2840c22a750980 (master).

Upstream Shortlog
-----------------

Brad King (2):
      5e556d53 Refactor CMake policy settings
      cb55cf5a Set CMake Policy CMP0063 to NEW within KWSys

Dāvis Mosāns (1):
      1c7c2139 ConsoleBuf: Fix character handling between buffer boundaries
2016-11-29 11:49:33 -05:00
Sebastian Holtermann c4d4becf8b QtAutogen tests: Move the complex test case to a subdirectory 2016-11-29 17:16:33 +01:00
Sebastian Holtermann 2599f5d64b QtAutogen tests: Extend test description in CMakeLists.txt 2016-11-29 17:16:33 +01:00
Sebastian Holtermann 7052af9d4a QtAutogen tests: Move independent sameName test to top list of CMakeLists.txt 2016-11-29 17:16:33 +01:00
Sebastian Holtermann d675004dba QtAutogen tests: Rename uiconly target to camel case uicOnly
Also move uicOnly sources to dedicated uicOnlySource directory.
2016-11-29 17:16:33 +01:00
Sebastian Holtermann cb4bc19ae1 QtAutogen tests: Rename rcc_empty target to camel case rccEmpty 2016-11-29 17:16:33 +01:00
Sebastian Holtermann 59dbd3f891 QtAutogen tests: Rename rcconly target to camel case rccOnly.
Also add dedicated rccOnlyRes.qrc file for the rccOnly target.
2016-11-29 17:16:33 +01:00
Brad King f75d936a04 Merge branch 'vs15-rename-generator' into release 2016-11-29 11:05:29 -05:00
Brad King 31e013ae60 Merge branch 'vs15-rename-generator' into vs15-rename-generator-for-master 2016-11-29 10:51:35 -05:00
Roman Wüger d639620e14 VS: Rename VS 15 generator to 'Visual Studio 15 2017'
The final name of this VS version was announced:

 https://blogs.msdn.microsoft.com/visualstudio/2016/11/16/visual-studio-2017-rc/

Add the year to the generator name accordingly.  For convenience, map
the name without the year to the name with the year.
2016-11-29 10:46:36 -05:00
caryoscelus 62c4cb4b6f UseSWIG: Record generated java files as custom command outputs
When another target depends on the generated files CMake must know which
custom command generates them in order to hook up the dependency
properly.  We already do this for Python.  Add the Java files too.
2016-11-29 10:21:05 -05:00
Harry Mallon f7c2a803a8 CMakeGraphVizOptions: Minor improvements to docs.
* Add `GRAPHVIZ_GRAPH_TYPE` options.
* Correct inaccurate usage info.
2016-11-29 10:05:02 -05:00
Michael Stürmer e390991846 VS: Add option to customize vcxproj user props file
Add a `VS_USER_PROPS_CXX` target property to set the user props file of
the generated `.vcxproj` file to be something other than the default
`$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props`.
2016-11-29 09:31:30 -05:00
Brad King 44c978a2da Merge branch 'release' 2016-11-29 09:02:07 -05:00
Brad King 325e452ea2 Merge topic 'find-module-cleanup-sweep'
745b56f5 Find*.cmake: drop the comments before including FPHSA
0ab9cb46 FindLibArchive: do not set LibArchive_FOUND explicitly
703d1943 FindLibArchive: use CMAKE_CURRENT_LIST_DIR to find FPHSA
2016-11-29 08:59:20 -05:00
Brad King 9e8f74fbb0 Merge topic 'FindDevIL-updates'
7abb12c8 FindDevIL: Make the ILUT library optional
d3f9f512 FindDevIL: fail properly when library is not found.
2016-11-29 08:59:17 -05:00
Brad King 2ee5eac366 Merge topic 'FindPkgConfig-fix-print-errors'
cbccebba FindPkgConfig: Fix missing error text when library version is specified
2016-11-29 08:59:14 -05:00
Brad King 839cd16396 Merge topic 'vs-default-build-package'
9e3164df VS: Add option to place `PACKAGE` target in solution default build
2016-11-29 08:59:11 -05:00
Brad King 2f7bafd6da Merge topic 'try_compile-honor-CMAKE_WARN_DEPRECATED'
6d604c49 try_compile: Honor CMAKE_WARN_DEPRECATED in test project
2016-11-29 08:59:07 -05:00
Brad King 4838ca14df Merge topic 'initial_cuda_language_support'
4cc601f2 Help: Add release note for CUDA support
7b9131da CUDA: Add tests to verify CUDA compiler works properly.
9cf5b98d CUDA: Prefer environment variables CUDACXX and CUDAHOSTCXX.
a5e806b3 CUDA: Add support for CMAKE_CUDA_COMPILE_OPTIONS_VISIBILITY
d038559e CUDA: Add separable compilation support to the makefile generator.
43ce4414 CUDA: Add separable compilation support to the ninja generator.
4b316097 CUDA: Add support for the CUDA_SEPARABLE_COMPILATION target property
ae05fcc6 CUDA: Add LinkLineComputer that computes cuda dlink lines.
115269a8 CUDA: Refactor cmLinkLineComputer to allow for better derived children.
5dec4031 CUDA: Refactor CMakeCUDAInformation to prepare for separable compilation.
5b20d0ab CUDA: C++ compile features now enable cuda c++11 support.
489c52ce CUDA: Use the host compiler for linking CUDA executables and shared libs.
bbaf2434 CUDA: add support for specifying an explicit host compiler.
a92f8d96 CUDA: Enable header dependency scanning.
ec6ce623 CUDA: State that cuda has preprocessor output and can generate assembly.
4f5155f6 CUDA: We now properly perform CUDA compiler identification.
...
2016-11-29 08:59:03 -05:00
Brad King a0af10e423 Merge topic 'librhash-left-shift-unsigned'
9e07ffa4 librhash: Avoid signed left-shift overflow in sha256
2016-11-29 08:58:59 -05:00
Brad King dd4e25a5a6 Merge topic 'libarchive-openssl-1.1'
6f23daea libarchive: Add support for building with OpenSSL 1.1
7d433206 libarchive: Add headers to adapt between OpenSSL 1.1 and older versions
2016-11-29 08:58:55 -05:00
Michael Stürmer 9e3164dfa2 VS: Add option to place PACKAGE target in solution default build
Add a `CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD` variable to control
this behavior.
2016-11-29 08:46:27 -05:00
Brad King 9e07ffa4e4 librhash: Avoid signed left-shift overflow in sha256
Fix `rhash_sha256_final` to use unsigned integers for left shifting to
avoid the possibility of undefined overflow behavior.
2016-11-29 08:30:25 -05:00
Kitware Robot 2f7e05fbc2 CMake Nightly Date Stamp 2016-11-29 00:01:04 -05:00
Rolf Eike Beer 745b56f58c Find*.cmake: drop the comments before including FPHSA
No need to explain this over and over again.  While at it, do some other
minor cleanups to whitespace and comments (i.e. delete them).
2016-11-28 16:40:13 -05:00
Rolf Eike Beer 0ab9cb4699 FindLibArchive: do not set LibArchive_FOUND explicitly
FPHSA already does this.
2016-11-28 16:39:24 -05:00
Rolf Eike Beer 703d194338 FindLibArchive: use CMAKE_CURRENT_LIST_DIR to find FPHSA
The version of CMake required to build CMake is now new enough to have
that variable.
2016-11-28 16:38:42 -05:00
Vladimír Vondruš 7abb12c826 FindDevIL: Make the ILUT library optional
Some distributions (such as ArchLinux) have only the IL and ILU
libraries and since these are mainly used, the module should succeed
even though ILUT was not found.  Removed it from the FPHSA() macro call,
making it effectively optional.
2016-11-28 16:31:25 -05:00
Vladimír Vondruš d3f9f5120c FindDevIL: fail properly when library is not found.
Due to a mismatch between module name and name passed to FPHSA() the
macro printed an error message but the error was not caught up by CMake.
Fix the typo.
2016-11-28 16:31:04 -05:00