summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ctest-capture-error'Brad King2016-09-2120-8/+201
|\ | | | | | | | | | | | | adf1e32f Help: Add notes for topic 'ctest-capture-error' d328dc68 CTest: Add CAPTURE_CMAKE_ERROR val to `ctest_*` commands 9ac2e189 ctest_coverage: If gcov is not found just warn, not error
| * Help: Add notes for topic 'ctest-capture-error'Brad King2016-09-201-0/+8
| |
| * CTest: Add CAPTURE_CMAKE_ERROR val to `ctest_*` commandsBill Hoffman2016-09-2018-6/+192
| | | | | | | | | | | | | | If a `ctest_*` command has CAPTURE_CMAKE_ERROR then any errors generated by cmake during that command will cause the value to be assigned `-1`. This will prevent a `ctest -S` script from returning non-zero unless the script explicitly calls `message(FATAL_ERROR)`.
| * ctest_coverage: If gcov is not found just warn, not errorBill Hoffman2016-09-201-2/+1
| |
* | Merge topic 'cmake-server-more-info'Brad King2016-09-215-46/+219
|\ \ | | | | | | | | | | | | | | | | | | | | | 4fb2b41a server-mode: Add debug support 537efe05 server-mode: Report Messages from cmake to clients ca779948 server-mode: Automate progress reporting 70b8ba9a cmake-server: Use consistent constant naming style
| * | server-mode: Add debug supportTobias Hunger2016-09-203-15/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the server to support development with some helper tools: You can now request debug information with statistics on how long execution of a command took, how long it took to serialize the JSON files, and how big the serialized JSON string is. Also allow to dump results into a file.
| * | server-mode: Report Messages from cmake to clientsTobias Hunger2016-09-205-1/+64
| | | | | | | | | | | | | | | Pass messages sent from cmake via Error(...) or Message(...) on to clients.
| * | server-mode: Automate progress reportingTobias Hunger2016-09-203-5/+25
| | | | | | | | | | | | | | | Wire up cmake::SetProgressUpdate to do progress reporting via the cmake server.
| * | cmake-server: Use consistent constant naming styleTobias Hunger2016-09-202-31/+27
| | |
* | | Merge topic 'fortran-submodules'Brad King2016-09-217-523/+660
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | df4aeb31 Help: Add notes for topic 'fortran-submodules' b5ac8b8a Fortran: Add support for submodule syntax in dependency scanning bdcc1f51 cmFortranParser: Skip module procedures/functions/subroutines
| * | | Help: Add notes for topic 'fortran-submodules'Brad King2016-09-201-0/+7
| | | |
| * | | Fortran: Add support for submodule syntax in dependency scanningBrad King2016-09-206-521/+643
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fortran 2008 [1] adds support for a new syntax related to modules: submodule ( ParentModule ) SubModule submodule ( ParentModule : SubModule ) NestedSubModule Both of these mean that the current source file requires the module `ParentModule` to be available if it is not provided in the current file. Teach our Fortran dependency scanner to parse this syntax to extract this relationship. For now simply tolerate the nested submodule case and extract only the dependency it expresses on the main module. Further work will be needed to extract dependencies among nested submodules. [1] http://fortranwiki.org/fortran/show/Fortran+2008 Closes: #16234
| * | | cmFortranParser: Skip module procedures/functions/subroutinesBrad King2016-09-202-47/+55
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fortran allows the syntax MODULE PROCEDURE ... MODULE FUNCTION ... MODULE SUBROUTINE ... to declare procedures/functions/subroutines that are members of modules. Do not treat such syntax as the definition of a module with one of these names. Issue: #16234
* | | Merge topic 'ninja-implicit-outputs'Brad King2016-09-214-12/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | 501f9c93 cmGlobalNinjaGenerator: Add API to check for implicit outputs support 144a24dc cmGlobalNinjaGenerator: Teach WriteBuild about implicit outputs
| * | | cmGlobalNinjaGenerator: Add API to check for implicit outputs supportBrad King2016-09-202-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Ninja 1.7 introduced support for implicit outputs on build statements. Add an internal API to check whether the Ninja version in use for the build supports this feature.
| * | | cmGlobalNinjaGenerator: Teach WriteBuild about implicit outputsBrad King2016-09-204-12/+30
| |/ / | | | | | | | | | | | | | | | | | | | | | Ninja 1.7 introduced support for implicit outputs on build statements. Teach WriteBuild to generate the corresponding syntax. Leave it up to callers to decide whether implicit outputs are supported by the Ninja version in use. For now simply update all call sites to pass an empty list of implicit outputs.
* | | Merge topic 'refactor-fortran-module-dir-lookup'Brad King2016-09-214-9/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | 7b5f8567 Fortran: Use module dir flag if needed for default module directory 1777570f cmGeneratorTarget: Refactor Fortran module directory lookup
| * | | Fortran: Use module dir flag if needed for default module directoryBrad King2016-09-204-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our buildsystem model says that the default Fortran module output directory is the build tree directory corresponding to the source tree `CMakeLists.txt` file adding the current target. Extend `cmGeneratorTarget::GetFortranModuleDirectory` to allow generators to pass in the compiler working directory. If the working directory does not match the default Fortran module output directory then we need an explicit module directory flag (e.g. `-J`) to tell the compiler to put/use modules in the latter. This does not affect the Makefile generator but will be useful for future introduction of Fortran support to the Ninja generator.
| * | | cmGeneratorTarget: Refactor Fortran module directory lookupBrad King2016-09-201-2/+5
| |/ / | | | | | | | | | Make `target_module_dir` and owned value so we can modify it.
* | | Merge topic 'update-kwsys'Brad King2016-09-213-67/+175
|\ \ \ | | | | | | | | | | | | | | | | | | | | 3876e297 Merge branch 'upstream-KWSys' into update-kwsys 9783ed1e KWSys 2016-09-20 (3f69ac40)
| * \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-09-203-67/+175
| |\ \ \ | | |/ / | |/| | | | | | | | | | * upstream-KWSys: KWSys 2016-09-20 (3f69ac40)
| | * | KWSys 2016-09-20 (3f69ac40)KWSys Upstream2016-09-203-67/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 3f69ac4009443743e17d6335f1952b8755aee054 (master). Upstream Shortlog ----------------- Dāvis Mosāns (6): f53440fe ConsoleBuf: Improve test error messages fd9e86e8 ConsoleBuf: Use two separate events for test sync fb8530ed ConsoleBuf: Make test more reliable c49ddccb ConsoleBuf: Fix test registry restoration 10e3f947 ConsoleBuf: Fix test to compare all bytes of wide character strings 3f69ac40 ConsoleBuf: Output console and test buffers on test failure
* | | | Merge topic 'runcmake-cpack-test-framework-fix'Brad King2016-09-211-70/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cb851a7c Tests: Fix RunCMake.CPack test infrastructure after logical conflict
| * | | | Tests: Fix RunCMake.CPack test infrastructure after logical conflictDomen Vrankar2016-09-201-70/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes in commit d9cec8ad (CPack/RPM: Generate source rpm (SRPM) packages on demand, 2016-09-19) logically conflict with the infrastructure updates in commit 4682b42b (Tests: Add subtest support to RunCMake/CPack infrastructure, 2016-09-13). Integrate the two changes so they work together.
* | | | | CMake Nightly Date StampKitware Robot2016-09-211-1/+1
| |/ / / |/| | |
* | | | Merge topic 'directory-list-targets-and-subdirs'Brad King2016-09-2014-1/+134
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0be1e15 Add directory properties to get source and binary directories cbca6582 Add directory property to list buildsystem targets 7a4b8d0d Add a directory property to list subdirectories 089868a2 cmState: Record buildsystem target names in each directory
| * | | | Add directory properties to get source and binary directoriesBrad King2016-09-197-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SOURCE_DIR and BINARY_DIR directory properties that return the absolute paths to the corresponding directories. These correspond to the target properties of the same names that we already have.
| * | | | Add directory property to list buildsystem targetsBrad King2016-09-197-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | Add a BUILDSYSTEM_TARGETS property to allow project code to traverse the list of its own targets in a given directory.
| * | | | Add a directory property to list subdirectoriesBrad King2016-09-199-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | Add a SUBDIRECTORIES directory property to allow project code to traverse the directory structure of itself as CMake sees it.
| * | | | cmState: Record buildsystem target names in each directoryBrad King2016-09-193-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maintain in the directory state the list of target names added to be built. These are normal, non-imported targets (but do include INTERFACE libraries).
* | | | | Merge topic 'cpack-rpm-policy-warnings'Brad King2016-09-201-1/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | edb3f6ee CPackRPM: Avoid CMP0007 warnings
| * | | | CPackRPM: Avoid CMP0007 warningsDomen Vrankar2016-09-201-1/+4
| |/ / / | | | | | | | | | | | | | | | | For older versions of CMake minimum required version CMP0007 policy warning was printed out.
* | | | Merge topic 'cpack-rpm-srpm-package'Brad King2016-09-209-26/+359
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d9cec8ad CPack/RPM: Generate source rpm (SRPM) packages on demand
| * | | | CPack/RPM: Generate source rpm (SRPM) packages on demandDomen Vrankar2016-09-209-26/+359
| |/ / / | | | | | | | | | | | | Closes: #15839
* | | | Merge topic 'cpack.hash_computing'Brad King2016-09-2011-13/+116
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 1c63aa4d CPack: Add option to generate a checksum file next to each package file 4682b42b Tests: Add subtest support to RunCMake/CPack infrastructure
| * | | | CPack: Add option to generate a checksum file next to each package filePetr Orlov2016-09-198-1/+76
| | | | | | | | | | | | | | | | | | | | Add variable CPACK_PACKAGE_CHECKSUM to activate it.
| * | | | Tests: Add subtest support to RunCMake/CPack infrastructureDomen Vrankar2016-09-193-12/+40
| |/ / /
* | | | Merge topic 'ifw-package-resources'Brad King2016-09-205-0/+138
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b807cd9b CPackIFW: Add 'cpack_ifw_add_package_resources' command
| * | | | CPackIFW: Add 'cpack_ifw_add_package_resources' commandKonstantin Podsvirov2016-09-195-0/+138
| |/ / /
* | | | Merge topic 'ExternalProject-HTTP_HEADER'Brad King2016-09-204-3/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 5e6716db Help: Add notes for topic 'ExternalProject-HTTP_HEADER' 0f424c3d ExternalProject: Add HTTP_HEADER
| * | | | Help: Add notes for topic 'ExternalProject-HTTP_HEADER'Brad King2016-09-191-0/+5
| | | | |
| * | | | ExternalProject: Add HTTP_HEADERRuslan Baratov2016-09-193-3/+18
| | | | |
* | | | | Merge topic 'cuda_use_cudadevrt_with_separable_compilation'Brad King2016-09-201-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 891e0ebd FindCUDA: find cudadevrt and link it if CUDA_SEPARABLE_COMPILATION is ON
| * | | | | FindCUDA: find cudadevrt and link it if CUDA_SEPARABLE_COMPILATION is ONRobert Maynard2016-09-201-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #15157 Patch-by: l0calh05t on gitlab.kitware.com
* | | | | | Merge topic 'cmake-server-experimental-protocols'Brad King2016-09-207-12/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7df8a8f2 server-mode: Add --experimental flag
| * | | | | | server-mode: Add --experimental flagTobias Hunger2016-09-207-12/+49
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow for experimental cmProtocolVersions, which will only ever get listed if the server was started with the (undocumented) "--experimental" flag. Mark current protocol version 1.0 as experimental.
* | | | | | Merge topic 'cleanup-Convert'Brad King2016-09-2029-291/+286
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6429d6d9 cmOutputConverter: Remove now-obsolete Convert method ad790617 Convert: Inline uses of START_OUTPUT 4cf707b0 Convert: Remove HOME_OUTPUT enum value 3d12ffbf Ninja: Update comment variable reference 4d69ac76 Convert: Move access to BinaryDirectory out of loops e7c89567 Convert: Inline uses of HOME_OUTPUT dc510919 Common: Use a string instead of enum for WorkingDirectory 76833149 Convert: Simplify switch dc95020e Convert: Remove obsolete MAKERULE enum value 1825f876 Convert: Move access to BinaryDirectory out of loops 25c39ac2 Convert: Inline HOME_OUTPUT MAKERULE conversion 516e79ba Convert: Inline MAKERULE conversions e13e519e Convert: Move access to BinaryDirectory out of loops 34c6e995 Convert: Avoid HOME_OUTPUT enum when converting to relative paths 839c65bc Convert: Move access to CurrentBinaryDirectory out of loops 21b5fdf9 Convert: Avoid START_OUTPUT enum when converting to relative paths ...
| * | | | | | cmOutputConverter: Remove now-obsolete Convert methodStephen Kelly2016-09-194-56/+0
| | | | | | |
| * | | | | | Convert: Inline uses of START_OUTPUTStephen Kelly2016-09-197-57/+107
| | | | | | |
| * | | | | | Convert: Remove HOME_OUTPUT enum valueStephen Kelly2016-09-192-4/+0
| | | | | | |