summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'memorize_msvc_like_compilers_C_support'Brad King2019-04-172-3/+10
|\ | | | | | | | | | | | | 8e4899fd6c CompileFeatures: Record which C features the MSVC compiler supports Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3226
| * CompileFeatures: Record which C features the MSVC compiler supportsRobert Maynard2019-04-122-3/+10
| | | | | | | | | | | | Use the infrastructure added by commit f92ccbc306c20554af (CompileFeatures: memoize C compilers with full language level support) to avoid using a `try_compile` to check for C 90/99/11 feature support when the running compiler is known to have a fixed set of feature support.
* | Merge branch 'release-3.14'Brad King2019-04-170-0/+0
|\ \
| * \ Merge branch 'FindOpenGL-libglvnd-subdir' into release-3.14Brad King2019-04-171-0/+3
| |\ \ | | | | | | | | | | | | Merge-request: !3236
* | \ \ Merge topic 'libglvnd-subdir'Brad King2019-04-171-0/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 844050adaf FindOpenGL: look for GLVND libraries with a libglvnd suffix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3236
| * | | FindOpenGL: look for GLVND libraries with a libglvnd suffixBen Boeckel2019-04-171-0/+3
| | | | | | | | | | | | | | | | | | | | On CentOS 6.10, the libglvnd package from EPEL installs its libraries under a libglvnd subdirectory.
* | | | CMake Nightly Date StampKitware Robot2019-04-171-1/+1
| | | |
* | | | Merge topic 'vs-project-import'Brad King2019-04-168-0/+74
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d145d72e70 VS: add target property VS_PROJECT_IMPORT_<propspath> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3143
| * | | | VS: add target property VS_PROJECT_IMPORT_<propspath>Leonid Pospelov2019-04-158-0/+74
| | | | | | | | | | | | | | | | | | | | Fixes: #18998
* | | | | Merge topic 'genex-output_name'Brad King2019-04-1637-214/+239
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60ec292258 Genex: Rename $<TARGET_*_OUTPUT_NAME:...> in $<TARGET_*_FILE_BASE_NAME:...> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3228
| * | | | | Genex: Rename $<TARGET_*_OUTPUT_NAME:...> in $<TARGET_*_FILE_BASE_NAME:...>Marc Chevrier2019-04-1537-214/+239
| | | | | |
* | | | | | Merge topic 'string-repeat'Brad King2019-04-1612-0/+136
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 536cca60ea string: introduce `REPEAT` sub-command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3239
| * | | | | | string: introduce `REPEAT` sub-commandAlex Turbov2019-04-1512-0/+136
| | | | | | |
* | | | | | | Merge topic 'autogen_moc_uic_single_job_queue'Brad King2019-04-1616-1268/+1705
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58f04b6ecf Autogen: Add ManySources test a3f062091f Autogen: Rename `cmQtAutoGeneratorMocUic` class to `cmQtAutoMocUic` 8cb26a0a2a Autogen: Factor out concurrency framework to cmWorkerPool class Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3224
| * | | | | | | Autogen: Add ManySources testSebastian Holtermann2019-04-158-0/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtAutogen/ManySources test generates a number of source, header, .ui and .qrc files that get AUTOMOC, AUTOUIC and AUTORCC processed. This stresses the concurrency framework in `cmQtAutoMocUic` and should reveal any issues with that.
| * | | | | | | Autogen: Rename `cmQtAutoGeneratorMocUic` class to `cmQtAutoMocUic`Sebastian Holtermann2019-04-154-69/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class name `cmQtAutoGeneratorMocUic` is long and cumbersome. This renames it to `cmQtAutoMocUic`.
| * | | | | | | Autogen: Factor out concurrency framework to cmWorkerPool classSebastian Holtermann2019-04-157-1234/+1545
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This factors out the concurrency framework in `cmQtAutoGeneratorMocUic` to a dedicated class `cmWorkerPool` which might be reused in other places. `cmWorkerPool` supports fence jobs that require that - all other jobs before in the queue have been processed before the fence job processing gets started, - no jobs later in the queue will be processed before the fence job processing has been completed. Fence jobs are needed where the completion of all previous jobs in the queue is a requirement for further processing. E.g. in `cmQtAutoGeneratorMocUic` the generation of `mocs_compilation.cpp` requires that all previous source file parse jobs have been completed.
* | | | | | | Merge branch 'release-3.14'Brad King2019-04-160-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'Boost-Gentoo' into release-3.14Brad King2019-04-163-1/+31
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3237
| * \ \ \ \ \ \ Merge branch 'vs2019-redist' into release-3.14Brad King2019-04-151-2/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3233
* | \ \ \ \ \ \ \ Merge topic 'vs2019-redist'Brad King2019-04-161-2/+5
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0b6448c85 IRSL: Update redist directory for VS 2019 update 1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3233
| * | | | | | | | IRSL: Update redist directory for VS 2019 update 1Brad King2019-04-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2019 Update 1 will fix its redist directories to be named `VC142` instead of `VC141`. It will also use cl `19.21` instead of `19.20` so we can use that to distinguish the versions. Fixes: #19131
* | | | | | | | | Merge topic 'Boost-Gentoo'Brad King2019-04-163-1/+31
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b54f72e94 FindBoost: Fix detection with version suffixes on Gentoo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3237
| * | | | | | | | FindBoost: Fix detection with version suffixes on GentooRolf Eike Beer2019-04-163-1/+31
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Gentoo case added by commit 1673923c30 (FindBoost: Add support for Boost 1.67 with Python version suffixes, 2018-03-18, v3.11.0~3^2) left out the `.` version component separator and instead duplicated the RPM case. Add the missing `.` now. Fixes: #18743
* | | | | | | | CMake Nightly Date StampKitware Robot2019-04-161-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge topic 'ctest-build-and-test-no-progress'Brad King2019-04-151-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81cc3de28e ctest: drop incremental progress-only messages from build-and-test output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3225
| * | | | | | | ctest: drop incremental progress-only messages from build-and-test outputBrad King2019-04-121-3/+4
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cmake progress callback is called with non-negative progress values to provide incremental updates on "Configuring" and "Generating" steps. These are useful in interactive views but are just noise in test output.
* | | | | | | Merge topic 'code-cleanup'Brad King2019-04-152-37/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e70a8d0df cmVisualStudio10TargetGenerator: Simplify code of two functions e10b04ef05 cmVisualStudio10TargetGenerator: Use count instead of find 2418a5aec0 cmVisualStudio10TargetGenerator: Remove uses of const_cast Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3223
| * | | | | | | cmVisualStudio10TargetGenerator: Simplify code of two functionsLeonid Pospelov2019-04-121-8/+6
| | | | | | | |
| * | | | | | | cmVisualStudio10TargetGenerator: Use count instead of findLeonid Pospelov2019-04-121-19/+9
| | | | | | | |
| * | | | | | | cmVisualStudio10TargetGenerator: Remove uses of const_castLeonid Pospelov2019-04-122-12/+10
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'iar-generalize'Brad King2019-04-159-116/+121
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea83d0f8fb IAR: Generalize and add support for IAR RX compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3196
| * | | | | | | IAR: Generalize and add support for IAR RX compilerStefan Andersson2019-04-129-116/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved common ASM setup to the common macros and changed version check.
* | | | | | | | Merge topic 'ghs_custom'Brad King2019-04-1530-234/+1105
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2bae6a1346 GHS: Update tests and notes 3b415c60c1 GHS: Update ExternalProject for GHS tools 83c47ef5b8 GHS: Update project layout to accommodate gbuild inconsistencies 5d2e1404bd GHS: Update project layout to build targets correctly b6bfa7eeb2 GHS: Support add_dependencies() command 39ee9718d9 GHS: Support add_custom_target() command 8d3dad9a76 GHS: Support add_custom_command( OUTPUT ) signature 37acc9e229 GHS: Update custom command build events Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Narendhar Manimohan <narendhar15@gmail.com> Merge-request: !3119
| * | | | | | | | GHS: Update tests and notesFred Baksik2019-04-1123-10/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- add new tests for custom commands -- minor test cleanup Fixes #15995 Fixes #18909 Fixes #15902
| * | | | | | | | GHS: Update ExternalProject for GHS toolsFred Baksik2019-04-112-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- When using default values for the external project forward GHS platform variables so that the external project builds with the same tools as the original project. -- Fix issue with bad top level project when GHS_PRIMARY_TARGET is set but has no value. In this case treat it as unset and use default value.
| * | | | | | | | GHS: Update project layout to accommodate gbuild inconsistenciesFred Baksik2019-04-114-135/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Do not use reference projects, use build hierarchy instead. gbuild has three parallel levels: * low -- Parallelizes compiling source files within a single project (.gpj) file when safe to do so. * medium -- Parallelizes processing files within a single linked output when safe to do so. * high [default] -- Parallelizes processing files whenever safe to do so, including linking task. Testing showed that for some combinations of gbuild / MULTI there are issues with building a project that uses references to target project files along with using {nobuild} option. Sometimes the archiving of a library and linking of an executable were happening in parallel and the build would fail when linking because the archive wasn't complete. This behavior was also inconsistent when running the build from MULTI and from the command line with gbuild. In some cases MULTI did not parallelize archiving and linking, but gbuild performed these actions in parallel. The parallel build issue was not seen when using a build hierarchy where the project listed the project files normally instead of using a reference link. The other option was to add the -parallel_level=medium to the command line when using "cmake --build" but this wouldn't fix the issue if gbuild itself was used to and the user might not be aware of the extra option used by cmake.
| * | | | | | | | GHS: Update project layout to build targets correctlyFred Baksik2019-04-115-156/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Restructure projects and files to support proper building of targets Build order is determined by hierarchy of project files and folders Custom targets may have been run multiple times in the original file / folder structure -- Default to build targets that are part of ALL target -- List all known targets for this project Includes global targets for ALL_BUILD and INSTALL -- Compute build order for building targets
| * | | | | | | | GHS: Support add_dependencies() commandFred Baksik2019-04-113-80/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- use references to list target dependencies
| * | | | | | | | GHS: Support add_custom_target() commandFred Baksik2019-04-115-79/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- add new project type that runs shell scripts in proper order
| * | | | | | | | GHS: Support add_custom_command( OUTPUT ) signatureFred Baksik2019-04-114-27/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- add new file type to run a shell script -- gbuild does not compute interfile dependencies like other build tools. Therefore calculate the required build order of custom commands and list all of them in the CMake Rules subproject.
| * | | | | | | | GHS: Update custom command build eventsFred Baksik2019-04-102-41/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Fixes issue where commands run out of order; Run commands as single script Do not allow build events to run in parallel -- Use command generator to parse the commands -- Support pre-link build events -- Support more options: COMMENT, BYPRODUCTS, WORKING_DIRECTORY
* | | | | | | | | Merge branch 'release-3.14'Brad King2019-04-150-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'backport-FindBoost-msvc-toolset-14.2' into release-3.14Brad King2019-04-121-5/+20
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | Merge-request: !3221
* | | | | | | | | Merge topic 'FindBoost-msvc-toolset-14.2'Brad King2019-04-151-5/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 032e969879 Merge branch 'backport-FindBoost-msvc-toolset-14.2' 717e85418b FindBoost: Add support for MSVC toolset version 14.2 9010f5c18a FindBoost: Add support for MSVC toolset version 14.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3221
| * \ \ \ \ \ \ \ \ Merge branch 'backport-FindBoost-msvc-toolset-14.2'Brad King2019-04-120-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | FindBoost: Add support for MSVC toolset version 14.2Brad King2019-04-121-5/+20
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the logic to express compatibility among 14.x versions.
| * | | | | | | | FindBoost: Add support for MSVC toolset version 14.2Brad King2019-04-121-5/+20
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Generalize the logic to express compatibility among 14.x versions.
* | | | | | | | CMake Nightly Date StampKitware Robot2019-04-151-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2019-04-141-1/+1
| | | | | | | |