summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* curl: Update script to get curl 7.60.0Brad King2018-05-181-1/+1
|
* CMake Nightly Date StampKitware Robot2018-05-181-1/+1
|
* Merge branch 'release-3.11'Brad King2018-05-170-0/+0
|\
| * CMake 3.11.2v3.11.2Brad King2018-05-171-1/+1
| |
* | Merge topic 'makefile-ar-limits'Brad King2018-05-171-4/+9
|\ \ | | | | | | | | | | | | | | | | | | b6c49713b3 Makefile: Fix command line limits for static libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2078
| * | Makefile: Fix command line limits for static libsViktor Mukha2018-05-161-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have been hitting the Windows command-line limit when cross-compiling static library (POCO) and having more than 8000 characters in the call to "ar". Calculating exact limits here are tricky, since this particular limit will only take into account object file strings, which is correct for response files, but not for the archive rules (link.txt files), since they also contain the call to "ar" and its arguments. Also, there can be other additional arguments if "ar" tool is wrapped into something else, so it is a good idea to leave more space than trying to exactly fit the limit. Since response files use half of the limit as a heuristic, we reproduce it here for consistency.
* | | Merge topic 'pr.file_write_check'Brad King2018-05-171-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2db4945150 file(WRITE): Report errors during write operation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2076
| * | | file(WRITE): Report errors during write operationRuslan Baratov2018-05-161-0/+8
| | | | | | | | | | | | | | | | | | | | We already report an error if the file cannot be opened for writing. Add another check to report an error if a write operation itself fails.
* | | | Merge topic 'autogen_register_info_files'Brad King2018-05-178-1/+92
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3715d0fbcf Tests: Add QtAutogen test for a low cmake_minimum_required version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2077
| * | | | Tests: Add QtAutogen test for a low cmake_minimum_required versionSebastian Holtermann2018-05-168-1/+92
| | |/ / | |/| |
* | | | Merge topic 'update-kwsys'Brad King2018-05-173-2/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3333e2791b Help: Add release note about 'copy_directory' behavior change 24367563d7 Merge branch 'upstream-KWSys' into update-kwsys 1e0a2e9377 KWSys 2018-05-15 (5f757898) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2080
| * | | | Help: Add release note about 'copy_directory' behavior changeBrad King2018-05-161-0/+6
| | | | | | | | | | | | | | | | | | | | Issue: #16001
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-05-162-2/+35
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-05-15 (5f757898) Fixes: #16001
| | * | | KWSys 2018-05-15 (5f757898)KWSys Upstream2018-05-162-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 5f757898119974aa30f700d5c38928ee48407320 (master). Upstream Shortlog ----------------- Marian Klymov (1): d06fcab7 SystemTools: Check source directory in CopyADirectory
* | | | | CMake Nightly Date StampKitware Robot2018-05-171-1/+1
| | | | |
* | | | | Merge topic 'regenerate-lexer-parser'Brad King2018-05-162-10/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a33cfc1bc regenerate-parsers.bash: Add script to automate parser generation 3d382a494f regenerate-lexers.bash: Add option to check timestamps 5cd9f5c965 regenerate-lexers.bash: Factor file names into variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2081
| * | | | | regenerate-parsers.bash: Add script to automate parser generationDaniel Franke2018-05-161-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This depends on - a suitable flex version in PATH (currently 3.0.4) - a suitable version of 'sed' in PATH (e.g. GNU sed)
| * | | | | regenerate-lexers.bash: Add option to check timestampsDaniel Franke2018-05-161-9/+22
| | | | | |
| * | | | | regenerate-lexers.bash: Factor file names into variablesDaniel Franke2018-05-161-8/+14
| | | | | |
* | | | | | Merge topic 'findqt4-extra-dirs'Brad King2018-05-161-27/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2934b025d FindQt4: New IMPORTS, PLUGINS and MKSPECS handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2060
| * | | | | | FindQt4: New IMPORTS, PLUGINS and MKSPECS handlingChristian Pfeiffer2018-05-141-27/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #14155
* | | | | | | Merge topic 'subdirectory-linking'Brad King2018-05-1619-10/+110
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9349cc1b9 target_link_libraries: Allow use with targets in other directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2040
| * | | | | | | target_link_libraries: Allow use with targets in other directoriesPatrick Stotko2018-05-1519-10/+110
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the command did not allow naming targets on the LHS that were not created in the calling directory. Lift this restriction to enable more flexible use by projects. Fixes: #17943
* | | | | | | Merge topic 'dotnet_target_fw_init'Brad King2018-05-168-4/+60
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71a033616a added CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2032
| * | | | | | | added CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION variableMichael Stürmer2018-05-158-4/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17955
* | | | | | | | Merge topic 'vs-nitpicks'Brad King2018-05-162-74/+70
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b88e138369 cmVisualStudio10TargetGenerator: minor code cleanup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2063
| * | | | | | | cmVisualStudio10TargetGenerator: minor code cleanupVitaly Stakhovsky2018-05-112-74/+70
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-05-161-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'release-3.11'Brad King2018-05-150-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'fix-automoc-warnings' into release-3.11Brad King2018-05-152-8/+23
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2066
* | \ \ \ \ \ \ Merge topic 'fix-automoc-warnings'Brad King2018-05-152-8/+23
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9672d81ca3 Qt4Macros: Don't AUTOMOC or AUTOUIC qt4-generated files 800b2fcf80 Qt4Macros: Use get_property/set_property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2066
| * | | | | | | Qt4Macros: Don't AUTOMOC or AUTOUIC qt4-generated filesMatthew Woehlke2018-05-152-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress AUTOMOC and AUTOUIC on files generated by Qt4 wrapping macros; particularly, those generated by `qt4_wrap_cpp`, `qt4_wrap_ui`, and `qt4_add_resources`. None of these should need AUTOMOC or AUTOUIC treatment, and CMP0071 makes it important to mark this explicitly.
| * | | | | | | Qt4Macros: Use get_property/set_propertyMatthew Woehlke2018-05-151-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace use of old-style {get,set}_source_file_properties with newer {get,set}_property.
* | | | | | | | Merge branch 'release-3.11'Brad King2018-05-150-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'custom-command-expand-empty' into release-3.11Brad King2018-05-143-0/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2074
| * \ \ \ \ \ \ \ Merge branch 'autogen_register_info_files' into release-3.11Brad King2018-05-141-0/+3
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | Merge-request: !2071
* | | | | | | | | Merge topic 'autogen_register_info_files'Brad King2018-05-151-0/+3
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e461a136c1 Autogen: Register generated dependency files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2071
| * | | | | | | | Autogen: Register generated dependency filesSebastian Holtermann2018-05-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For CMP0058 record that rcc info files are generated by CMake. Fixes: #17985
* | | | | | | | | Merge topic 'custom-command-expand-empty'Brad King2018-05-153-0/+10
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | / / / / | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | 6e59491659 add_custom_{command,target}: Fix crash on empty expanded command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2074
| * | | | | | | add_custom_{command,target}: Fix crash on empty expanded commandBrad King2018-05-143-0/+10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our custom command generation logic assumes that all command lines have at least `argv0`. In `add_custom_{command,target}` we already check that at least a `COMMAND` was given, but using `COMMAND_EXPAND_LISTS` in combination with a generator expression that expands to an empty string may produce an empty command line. In this case simply add an empty string as a command to maintain our internal invariant. Fixes: #17993
* | | | | | | CMake Nightly Date StampKitware Robot2018-05-151-1/+1
| | | | | | |
* | | | | | | Merge topic 'FindPkgConfig-LINK_LIBRARIES'Brad King2018-05-144-21/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92ac721a44 FindPkgConfig: export the list of found libraries also as variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2068
| * | | | | | | FindPkgConfig: export the list of found libraries also as variableRolf Eike Beer2018-05-114-21/+47
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'cuda-vs-cuda-device-runtime'Brad King2018-05-141-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a170a59a58 VS: Link CUDA binaries with the device runtime library 'cudadevrt' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2062
| * | | | | | | VS: Link CUDA binaries with the device runtime library 'cudadevrt'Brad King2018-05-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://docs.nvidia.com/cuda/nvrtc/index.html there are some cases where a CUDA binary "...must be linked against the CUDA device runtime (cudadevrt) library". When `nvcc` drives linking it automatically links to runtime libraries as follows: * -cudart=none: None * -cudart=shared: -lcudadevrt -lcudart * -cudart=static: -lcudadevrt -lcudart_static The `cudadevrt` library is the cuda device runtime library. It is always static so passing it to the linker when not necessary does not hurt anything. With Ninja and Makefile generators, we detect `cudadevrt` and either `cudart` or `cudart_static` libraries implied by `nvcc` and then add them to link lines driven by a host compiler. However, this does not work with the VS generator because the CUDA Toolkit Visual Studio integration does not use `nvcc` to link binaries and instead uses `link.exe` directly. Visual Studio project files (`.vcxproj`) for CUDA are expected to explicitly list the needed runtime libraries. Our VS generator already adds `cudart.lib` or `cudart_static.lib` based on the `-cudart=` flag. Update it to also add `cudadevrt.lib` as nvcc does. Fixes: #17988
* | | | | | | | Merge branch 'release-3.11'Brad King2018-05-140-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'irsl-fortran-only-linux' into release-3.11Brad King2018-05-111-8/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2061
* | \ \ \ \ \ \ \ Merge topic 'irsl-fortran-only-linux'Brad King2018-05-141-8/+10
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05ece372a6 IRSL: Fix Intel library list for ifort-only setups Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2061
| * | | | | | | | IRSL: Fix Intel library list for ifort-only setupsChristian Pfeiffer2018-05-111-8/+10
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #17727
* | | | | | | | Merge topic 'update-kwsys'Brad King2018-05-144-15/+30
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05d67d2545 Merge branch 'upstream-KWSys' into update-kwsys 55efd14733 KWSys 2018-05-11 (46da6b14) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2064
generated by cgit v0.12 at 2025-01-26 06:45:35 (GMT)