summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-06-222-15/+12
|\ | | | | | | | | * upstream-KWSys: KWSys 2018-06-22 (49068d94)
| * KWSys 2018-06-22 (49068d94)KWSys Upstream2018-06-222-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 49068d948ee03cde172fe5ff15a2778c50f91d38 (master). Upstream Shortlog ----------------- Brad King (1): 5d6f59fe SystemTools: Change SplitString return type to use std::string
* | Merge topic 'cpack-generator-documentation'Brad King2018-06-2268-3528/+3561
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57e4c51e8a Help: Update old version release notes for CPack generator docs 4181830881 Help: Add release notes for CPack generator documentation and module updates 48bc8b2b82 CPack: Move internal implementation modules into Internal/CPack directory 2a2829cc75 Help: Add new section for CPack generators be6267808a CPackIFW: Turn documentation into a block comment 0180524c7a Help: Move legacy CPack modules into separate section Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2149
| * | Help: Update old version release notes for CPack generator docsBrad King2018-06-2112-108/+110
| | | | | | | | | | | | | | | Replace references to the CPack "modules" with proper terminology referencing the CPack generator documentation directly.
| * | Help: Add release notes for CPack generator documentation and module updatesKyle Edwards2018-06-211-0/+9
| | |
| * | CPack: Move internal implementation modules into Internal/CPack directoryKyle Edwards2018-06-2122-2724/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These modules are not meant to be included by user code, they are only an internal implementation detail for CPack. Having them live in the main Modules directory with documentation was misleading, so they have been moved into Modules/Internal/CPack, and their documentation has been stripped following its move into the new "CPack Generators" section. No-op modules which contained only documentation have been removed entirely. The only module that hasn't been moved is CPackIFW, because it contains user-facing macros which would be lost if it were moved. So, the CPackIFW module has been updated with a note explaining what needs to (eventually) happen.
| * | Help: Add new section for CPack generatorsKyle Edwards2018-06-2133-371/+2961
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation for CPack generators previously lived in their respective internal CMake modules. This setup was misleading, because it implied that you should include the modules in your own code, which is not the case. Moving the documentation into a separate section does a better job of hiding the internal modules, which are just an implementation detail. The generator documentation has also been modified to remove any references to the module name. The CPackIFW module is a special exception: since it has user-facing macros, the documentation for these macros has been kept in the module page, while all other documentation related to the IFW generator has been moved into the new section. To make it easier to find the new documentation, the old help pages for the CPack*.cmake modules have not been deleted, but have been replaced with a link to their respective help page in the new documentation section.
| * | CPackIFW: Turn documentation into a block commentKyle Edwards2018-06-211-671/+672
| | |
| * | Help: Move legacy CPack modules into separate sectionKyle Edwards2018-06-211-12/+23
| | | | | | | | | | | | | | | | | | | | | These modules are being moved out of user visibility and into an internal section of CMake. To keep them for historical reference in the manual, this commit moves them into a separate "Legacy CPack Modules" section.
* | | Merge topic 'cmake_autogen_verbose'Brad King2018-06-2214-8/+69
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b85ef5cd0 Autogen: Add release notes for CMAKE_AUTOGEN_VERBOSE 6651aab2ab Autogen: Add documentation for CMAKE_AUTOGEN_VERBOSE aa7d8a092c Autogen: Enable CMAKE_AUTOGEN_VERBOSE in all tests e28dc3b1d8 Autogen: Add CMAKE_AUTOGEN_VERBOSE variable support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2157
| * | | Autogen: Add release notes for CMAKE_AUTOGEN_VERBOSESebastian Holtermann2018-06-211-0/+6
| | | |
| * | | Autogen: Add documentation for CMAKE_AUTOGEN_VERBOSESebastian Holtermann2018-06-212-0/+14
| | | |
| * | | Autogen: Enable CMAKE_AUTOGEN_VERBOSE in all testsSebastian Holtermann2018-06-215-0/+5
| | | |
| * | | Autogen: Add CMAKE_AUTOGEN_VERBOSE variable supportSebastian Holtermann2018-06-216-8/+44
| |/ / | | | | | | | | | | | | Setting CMAKE_AUTOGEN_VERBOSE enables verbose output during AUTOMOC, AUTOUIC and AUTORCC generation.
* | | Merge topic 'vs_debugger'Brad King2018-06-2216-7/+142
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 797de7a6f6 VS10Project: Expand VS_DEBUGGER_* capabilities Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2150
| * | | VS10Project: Expand VS_DEBUGGER_* capabilitiesJon Chronopoulos2018-06-1716-7/+142
| | | | | | | | | | | | | | | | | | | | This adds VS_DEBUGGER_COMMAND_ARGUMENTS and VS_DEBUGGER_ENVIRONMENT as well as allowing VS_DEBUGGER_* to use generator expressions.
* | | | Merge branch 'release-3.12'Brad King2018-06-220-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'FindJPEG-fix-debug' into release-3.12Brad King2018-06-211-7/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2159
* | \ \ \ \ Merge topic 'FindJPEG-fix-debug'Brad King2018-06-221-7/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae4a548302 FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variables 7876f329a9 FindJPEG: Add forgotten names of libraries for Debug configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2159
| * | | | | FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variablesAndrey Karpov2018-06-211-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | These have been deprecated since 2002!
| * | | | | FindJPEG: Add forgotten names of libraries for Debug configurationAndrey Karpov2018-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.12.0-rc1~202^2~1 (FindJPEG: Add multi config support and associated docs, 2018-04-17) accidentally left out the default jpeg library names from consideration for debug variants.
* | | | | | CMake Nightly Date StampKitware Robot2018-06-221-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'LINK_OPTIONS'Brad King2018-06-211-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b16fd1341d Help: add_library(INTERFACE): add reference to add_link_options() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2160
| * | | | | Help: add_library(INTERFACE): add reference to add_link_options()Marc Chevrier2018-06-201-0/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-06-211-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.12'Brad King2018-06-200-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'vs-cuda-no-host-includes' into release-3.12Brad King2018-06-201-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2158
| * \ \ \ \ \ Merge branch 'vs-cuda-maxrregcount' into release-3.12Brad King2018-06-201-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2156
| * \ \ \ \ \ \ Merge branch 'xcode-10-legacy-build-system' into release-3.12Brad King2018-06-196-29/+49
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2151
* | \ \ \ \ \ \ \ Merge topic 'vs-cuda-no-host-includes'Brad King2018-06-201-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 543b6826ee VS: Avoid duplication of CUDA include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2158
| * | | | | | | | VS: Avoid duplication of CUDA include directoriesBrad King2018-06-201-0/+1
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already place all include directories for CUDA inside `CudaCompile` so we do not need to use any from `ClCompile`. Tell `CudaCompile` not to use the host compiler's include directory settings. Fixes: #18101
* | | | | | | | Merge topic 'vs-cuda-maxrregcount'Brad King2018-06-201-0/+3
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d3a3d7459 VS: Add CUDA flag table entry for -maxrregcount Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2156
| * | | | | | | VS: Add CUDA flag table entry for -maxrregcountBrad King2018-06-201-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes: #18104
* | | | | | | Merge topic 'xcode-10-legacy-build-system'Brad King2018-06-206-29/+49
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca69206893 Tests: Do not use i386 architecture with Xcode 10 and above 71fa78ff7a Tests: Teach RunCMake to ignore Xcode missing file type warnings 057ecb8f6f C++ feature checks: Ignore Xcode warnings 985d3a162c Xcode: Use legacy build system Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2151
| * | | | | Tests: Do not use i386 architecture with Xcode 10 and aboveBrad King2018-06-192-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | Xcode 10 dropped support for i386 builds.
| * | | | | Tests: Teach RunCMake to ignore Xcode missing file type warningsBrad King2018-06-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 10 beta warns xcodebuild... warning: file type '::com.apple.instruments.instrdst' is based on missing file type 'default::com.apple.package' Teach RunCMake to drop such lines before matching against expected output.
| * | | | | C++ feature checks: Ignore Xcode warningsGregor Jasny2018-06-191-0/+2
| | | | | |
| * | | | | Xcode: Use legacy build systemGregor Jasny2018-06-192-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | Closes: #18099
* | | | | | CMake Nightly Date StampKitware Robot2018-06-201-1/+1
| | | | | |
* | | | | | Merge topic 'install_from_another_directory'Brad King2018-06-198-3/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e89ad0f94e install: Allow installing targets created in another directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2152
| * | | | | | install: Allow installing targets created in another directoryZack Galbreath2018-06-188-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, `install(TARGETS)` would only accept targets created in the same directory scope. Relax this restriction by searching the global scope when determining whether or not a target exists. Fixes: #14444
* | | | | | | Merge branch 'release-3.12'Brad King2018-06-190-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'xcode-10-archs' into release-3.12Brad King2018-06-197-13/+20
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | Merge-request: !2153
| * | | | | | Merge branch 'FindCURL-target-name' into release-3.12Brad King2018-06-192-6/+6
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | Merge-request: !2154
* | | | | | | Merge topic 'xcode-10-archs'Brad King2018-06-197-13/+20
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc5bcad45e Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2153
| * | | | | | Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCHBrad King2018-06-187-13/+20
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 10 no longer populates `CURRENT_ARCH` with the current architecture in shell scripts and instead uses `undefined_arch`. Instead we must use `ARCHS`. It lists all architectures separated by spaces. Fixes: #18085
* | | | | | Merge topic 'FindCURL-target-name'Brad King2018-06-192-6/+6
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e356734a7 FindCURL: Rename imported target to match upstream CURL Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Merge-request: !2154
| * | | | | FindCURL: Rename imported target to match upstream CURLBrad King2018-06-182-6/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream CURL provides imported target `CURL::libcurl`. Rename the target added by `FindCURL` to match. We don't need compatibility with the old name because it has never been in a CMake release (except a 3.12 release candidate). Suggested-by: Jakub Zakrzewski <slither.jz@gmail.com> Acked-by: Rolf Eike Beer <eike@sf-mail.de> Fixes: #18091
* | | | | Merge topic 'subdir_target_sources'Craig Scott2018-06-1946-4/+447
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 316815e1f4 target_sources: Interpret relative paths as relative to the calling directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2128
| * | | | | target_sources: Interpret relative paths as relative to the calling directoryPatrick Stotko2018-06-1846-4/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the command considered non-absolute source file paths relative to the associated target on the LHS. This causes problems in incremental builds where files are added from subdirectories and forces users to workaround by manually converting to absolute paths. Change this to enable more intuitive usage by projects. Fixes #17981