summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Vs: fix CSharp custom command by introducing inline MSBuild <Targets>sMichael Stürmer2017-06-229-6/+170
| | | | | | | | The custom command implementation is based on the Microsoft support article: https://docs.microsoft.com/en-us/visualstudio/msbuild/how-to-extend-the-visual-studio-build-process Fixes: #16960
* Vs: factor out computation of <Link> tag for CSharp source filesMichael Stürmer2017-06-222-8/+22
|
* Vs: refactor WriteCustomRule for preparation of CSharp supportMichael Stürmer2017-06-222-18/+34
|
* Vs: disable unnecessary <ItemDefinitionGroups> for CSharp targetsMichael Stürmer2017-06-221-0/+3
|
* Vs: change comparison to use .ProjectType member always as first comparatorMichael Stürmer2017-06-221-23/+23
|
* Merge topic 'vs-cuda-fix-flags'Brad King2017-06-224-10/+44
|\ | | | | | | | | | | | | | | 3b754215 VS: Improve workaround for CUDA -Xcompiler placement bug f2059585 VS: Fix target_compile_options for CUDA Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !996
| * VS: Improve workaround for CUDA -Xcompiler placement bugBrad King2017-06-212-3/+14
| | | | | | | | | | | | | | | | | | | | In commit v3.9.0-rc1~431^2~6 (VS: Place CUDA host compiler options in proper project file fields, 2017-03-07) we worked around a bug in the CUDA VS integration by dropping `AdditionalCompilerOptions`. However, this silently drops `-Xcompiler=` options given by the user that don't map to one of CudaCompile's dedicated settings. Improve the workaround to instead put the remaining `AdditionalCompilerOptions` into the `AdditionalOptions` field behind `-Xcompiler=` ourselves.
| * VS: Fix target_compile_options for CUDABrad King2017-06-213-7/+30
| | | | | | | | | | | | | | | | | | Fix the VS generator to honor `COMPILE_OPTIONS` for CUDA. The exclusion added by commit v3.9.0-rc1~431^2~7 (VS: Do not pass CUDA compile options to C compiler, 2017-03-07) was correct but we need additional logic to pass the CUDA compile options to the CUDA compiler. Also we should still pass the CXX or C options to MSVC (ClCompile) when those languages are enabled even if the link language is CUDA.
* | Merge topic 'cuda-macos-rpath-in-tests'Brad King2017-06-227-23/+17
|\ \ | | | | | | | | | | | | | | | | | | fff782f6 Tests: Simplify CUDA rpath on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !995
| * | Tests: Simplify CUDA rpath on macOSBrad King2017-06-217-23/+17
| | | | | | | | | | | | | | | Use the `BUILD_RPATH` property and reference the CMake-computed location of the runtime libraries.
* | | Merge topic 'vs_fix_configuration_error'Brad King2017-06-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0db4c7a0 Tests: Verify registry value is not "/registry" before using Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !994
| * | | Tests: Verify registry value is not "/registry" before usingMichael Stürmer2017-06-211-1/+1
| | | | | | | | | | | | | | | | Fixes: #17002
* | | | Merge topic 'vs_csharp_link_to_managed_cxx'Brad King2017-06-226-4/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51865fc6 Vs: allow CSharp targets to be linked to CXX targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !993
| * | | | Vs: allow CSharp targets to be linked to CXX targetsMichael Stürmer2017-06-216-4/+54
| | | | | | | | | | | | | | | | | | | | Fixes: #16755
* | | | | CMake Nightly Date StampKitware Robot2017-06-221-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release-3.9'Brad King2017-06-210-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'cuda-version-for-vs' into release-3.9Brad King2017-06-201-0/+2
| |\ \ \
| * \ \ \ Merge branch 'update-expat' into release-3.9Brad King2017-06-2011-171/+910
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge topic 'autogen_brace'Brad King2017-06-217-11/+69
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50b3837c Autogen: Q_OBJECT behind brace test 01d2b745 Autogen: Check for Q_OBJECT/Q_GADGET after brace Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !986
| * | | | | Autogen: Q_OBJECT behind brace testSebastian Holtermann2017-06-206-9/+65
| | | | | |
| * | | | | Autogen: Check for Q_OBJECT/Q_GADGET after braceSebastian Holtermann2017-06-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Closes #16971
* | | | | | Merge topic 'CheckTypeSize-arm-archs'Brad King2017-06-211-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72ccb9f4 CheckTypeSize: Add support for arm architectures Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !989
| * | | | | | CheckTypeSize: Add support for arm architecturesDouglas McKenzie2017-06-201-0/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds detection for `armv7`, `armv7s` and `arm64` when performing type size checks on universal binaries for iOS. Fixes: #16992
* | | | | | Merge topic 'cuda-version-for-vs'Brad King2017-06-211-0/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | f94213a1 Help: Update 3.9 release notes with recommended CUDA version for VS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !990
| * | | | | Help: Update 3.9 release notes with recommended CUDA version for VSBrad King2017-06-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CUDA 8.0.44 contains a bug in its VS integration that breaks preprocessor definitions in some cases. Recommend using at least 8.0.61 which fixes the problem. Fixes: #16993
* | | | | | Merge topic 'update-expat'Brad King2017-06-2111-171/+910
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5afb178 expat: Fix compilation on systems without stdint.h 0a40c668 Merge branch 'upstream-expat' into update-expat 4b8a8c22 expat 2017-06-17 (c4446687) d9d191a1 expat: Update script to get Expat 2.2.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !987
| * | | | expat: Fix compilation on systems without stdint.hBrad King2017-06-201-1/+11
| | | | |
| * | | | Merge branch 'upstream-expat' into update-expatBrad King2017-06-1910-169/+897
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-expat: expat 2017-06-17 (c4446687)
| | * | | | expat 2017-06-17 (c4446687)Expat Upstream2017-06-1911-186/+928
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libexpat/libexpat.git at commit c4446687cfc6c5fd7f6371aeaf24c69402a3589e (R_2_2_1).
| * | | | | expat: Update script to get Expat 2.2.1Brad King2017-06-191-2/+3
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-06-211-1/+1
| | | | | |
* | | | | | Merge topic 'FindICU-data-vars'Brad King2017-06-201-24/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3566af83 FindICU: Search for packaged data files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !981
| * | | | | | FindICU: Search for packaged data filesRoger Leigh2017-06-171-24/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files Makefile.inc and pkgdata.inc are installed by ICU to <libdir>/icu and on some distributions to <libdir>/<arch>/icu. These are required by ICU tools like pkgdata, and so are needed by other package build systems at build time, in addition to the libraries and executables already searched for. Search for the files and create cache entries for them, as done for executables.
* | | | | | | Merge topic 'FindwxWidgets-fix-flag-parse'Brad King2017-06-201-19/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7a0bf86 FindwxWidgets: Fix parsing of cxxflags when paths contain -D or -I Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !975
| * | | | | | | FindwxWidgets: Fix parsing of cxxflags when paths contain -D or -IThierry Crozat2017-06-191-19/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use proper command-line parsing rather than accidentally matching content in the middle of paths that looks like flags. Fixes: #16986
* | | | | | | | Merge topic 'curses-form-advanced'Brad King2017-06-201-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b53dee2 FindCurses: mark CURSES_FORM_LIBRARY as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !978
| * | | | | | | | FindCurses: mark CURSES_FORM_LIBRARY as advancedDaniel Pfeifer2017-06-171-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'vs_dotnet_referenceprop_documentation'Brad King2017-06-201-6/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18443600 Vs: fix documentation for target property VS_DOTNET_REFERENCEPROP_* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !980
| * | | | | | | Vs: fix documentation for target property VS_DOTNET_REFERENCEPROP_*Michael Stürmer2017-06-171-6/+9
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2017-06-201-1/+1
| | | | | | |
* | | | | | | Merge topic 'vs_csharp_fix_win32manifest_param'Brad King2017-06-197-6/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec7b3af7 Vs: remove /nowin32manifest from C# flags to enable default VS behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !969
| * | | | | | | Vs: remove /nowin32manifest from C# flags to enable default VS behaviorMichael Stürmer2017-06-167-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if /nowin32manifest is specified, it will be preferred over any occurring /win32manifest:<file> parameter Fixes: #16969, #16970
* | | | | | | | Merge topic 'FindHDF5-parallel-from-wrapper'Brad King2017-06-191-21/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b9d8c4d FindHDF5: Fix parallel detection when primary compiler is an HDF5 wrapper Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !974
| * | | | | | | | FindHDF5: Fix parallel detection when primary compiler is an HDF5 wrapperChuck Atkins2017-06-161-21/+27
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is covering a different use case where your primary compilers are HDF5 wrappers, as is the case when using the Cray Programming Environment. The existing code tries to query the compiler using options only available to h5cc and friends, which doesn't work when your wrapper is not h5cc, as is the case with the CrayPE. This change instead pulls strings out of a test binary when testing for "is your regular compiler an HDF5 wrapper" while the "query wrapper for options" is reserved for the "I found the hdf5 wrappers but they're not your main compiler" mode.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-06-191-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-06-181-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-06-171-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'release-3.9'Brad King2017-06-160-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'doc-compile-features' into release-3.9Brad King2017-06-152-4/+4
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'doc-dev-maint'Brad King2017-06-161-0/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0725f2f Help/dev: Add review instructions to maintainer guide Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !973
generated by cgit v0.12 at 2025-01-23 08:48:18 (GMT)