summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake: --build -j <jobs> should not accept 0.Fred Baksik2019-05-0111-3/+48
| | | | Fixes #19059
* Merge branch 'release-3.14'Brad King2019-04-220-0/+0
|\
| * CMake 3.14.3v3.14.3Brad King2019-04-221-1/+1
| |
* | Merge topic 'sunpro-cxx14-features'Brad King2019-04-223-0/+23
|\ \ | | | | | | | | | | | | | | | | | | 66f3f11af5 SunPro: Record support for C++14 features by SunPro 5.{14,15} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3248
| * | SunPro: Record support for C++14 features by SunPro 5.{14,15}Brad King2019-04-193-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SunPro 5.15 supports `-std=c++14` and several C++14 features. SunPro 5.14 accepts `-std=c++14` but does not update its definition of `__cplusplus` or any other macro to distinguish it from `-std=c++11`, so we need to blacklist a couple features that do work but that we cannot report for that version. We can still support `cxx_std_14`. Co-Author: Robert Maynard <robert.maynard@kitware.com>
* | | Merge topic 'msvc-warning-flags'Brad King2019-04-2214-5/+109
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1baf122cd4 MSVC: Do not add /W3 to CMAKE_<LANG>_FLAGS by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3250
| * | | MSVC: Do not add /W3 to CMAKE_<LANG>_FLAGS by defaultBrad King2019-04-1914-5/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not add default warning flags on other compilers, and having a warning flag in the default flags makes it hard for projects to customize the warning level. They need to use string processing to remove `/W3` from `CMAKE_{C,CXX}_FLAGS`. Therefore we should drop it. However, projects may be using string processing to replace `/W3` with another flag, so we cannot simply drop it. Add a policy to drop it in a compatible way. Fixes: #18317
* | | | Merge branch 'release-3.14'Brad King2019-04-220-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'findqt3-hints-fix' into release-3.14Brad King2019-04-221-5/+7
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !3254
| * \ \ \ Merge branch 'vs-default-platform' into release-3.14Brad King2019-04-1910-3/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3246
* | \ \ \ \ Merge topic 'findqt3-hints-fix'Brad King2019-04-221-5/+7
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | c298c4553b FindQt3: Restore missing lib and bin path suffixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3254
| * | | | | FindQt3: Restore missing lib and bin path suffixesChristian Pfeiffer2019-04-221-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore path suffixes incorrectly removed by commit a62d50ec56 (Modules: Replace coded PATHS with PATH_SUFFIXES, 2017-11-20, v3.11.0-rc1~293^2). Hints do not participate in the usual bin/lib subdirectory search that `<PackangeName>_ROOT` or `CMAKE_PREFIX_PATH` exhibit. Fixes: #19185
* | | | | | Merge topic 'vs-default-platform'Brad King2019-04-2210-3/+40
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | db02be85a0 VS: Provide the default platform name to project code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3246
| * | | | | VS: Provide the default platform name to project codeBrad King2019-04-1910-3/+40
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value of `CMAKE_VS_PLATFORM_NAME` is computed by Visual Studio generators based on `CMAKE_GENERATOR_PLATFORM` or some default. Prior to the VS 2019 generator, the default was always `Win32`. However, for the `Visual Studio 16 2019` generator, the default is based on the host platform. Store the default in a new `CMAKE_VS_PLATFORM_NAME_DEFAULT` variable for use by project code. This is particularly useful in toolchain files because they are allowed to set `CMAKE_GENERATOR_PLATFORM` and so `CMAKE_VS_PLATFORM_NAME` is not yet known. Of course the toolchain file author knows whether it will set `CMAKE_GENERATOR_PLATFORM`, and if not then `CMAKE_VS_PLATFORM_NAME_DEFAULT` provides the platform name that will be used. Fixes: #19177
* | | | | CMake Nightly Date StampKitware Robot2019-04-221-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-04-211-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-04-201-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'test-find_package-resolve-symlinks'Brad King2019-04-192-8/+14
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | a9428fc473 Tests: Fix FindPackageTest when path to source has a symlink e27437d0e0 Tests/FindPackageTest: Tell Git to ignore temporary symlink path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3244
| * | | Tests: Fix FindPackageTest when path to source has a symlinkBrad King2019-04-181-8/+13
| | | | | | | | | | | | | | | | Exclude a portion of the test that does not work in this case.
| * | | Tests/FindPackageTest: Tell Git to ignore temporary symlink pathBrad King2019-04-181-0/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2019-04-191-1/+1
|/ / /
* | | Merge topic 'unique'Brad King2019-04-187-30/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9ecb3f8d5c Ninja,Makefile: use `unique_ptr` for memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3230
| * | | Ninja,Makefile: use `unique_ptr` for memory managementSaleem Abdulrasool2019-04-187-30/+21
| | | | | | | | | | | | | | | | | | | | Use a `unique_ptr` to manage the lifetime of the `MacOSXContentGenerator` and 'OSXBundleGenerator` rather than manually handling the lifetime.
* | | | Merge topic 'add_xl_cxx14_support'Brad King2019-04-183-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 458ea9d76c XL: Add C++14 language level flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3235
| * | | | XL: Add C++14 language level flagsRobert Maynard2019-04-153-0/+13
| |/ / /
* | | | Merge topic 'update-kwsys'Brad King2019-04-185-88/+78
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e47391400 bootstrap: Update for new KWSys configuration option fb15c27562 Merge branch 'upstream-KWSys' into update-kwsys 0225b05afe KWSys 2019-04-17 (c42b92f0) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3242
| * | | | bootstrap: Update for new KWSys configuration optionBrad King2019-04-171-0/+2
| | | | |
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-04-174-88/+76
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-04-17 (c42b92f0)
| | * | | | KWSys 2019-04-17 (c42b92f0)KWSys Upstream2019-04-174-88/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit c42b92f0fe01cf588aacc1984501b4fdcc58994e (master). Upstream Shortlog ----------------- Ben Boeckel (1): 84bd7c9e SystemTools: support hiding the translation map Sebastian Holtermann (8): 00a3a436 SystemTools: Update buffered env value string only on a change d6235796 SystemTools: Optimize iterator lifetime in JoinPath 9992f69b SystemTools: Optimize range loop in FindName method 8c9ca162 SystemTools: Optimize range loop in FindProgram method c7e3ab12 SystemTools: Optimize range loop in FindProgram method ac8d2033 SystemTools: Optimize range loop in FindLibrary method 815cc593 SystemTools: Optimize range loop in FindProgramPath method 5d8af0d6 SystemTools: Optimize range loop in RelativePath method
* | | | | | CMake Nightly Date StampKitware Robot2019-04-181-1/+1
| | | | | |
* | | | | | Merge topic 'msvc-runtime-library'Brad King2019-04-1738-17/+482
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb3370b6a1 MSVC: Add abstraction for runtime library selection f621e7fa5d VS: Fix Fortran runtime library flag map special case for '-' options Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Acked-by: Leonid Pospelov <pospelovlm@yandex.ru> Merge-request: !3211
| * | | | | | MSVC: Add abstraction for runtime library selectionBrad King2019-04-1737-13/+478
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace our hard-coded defaults for `/MD` and `/MDd` with a first-class abstraction to select the runtime library from an enumeration of logical names. We've long hesitated to do this because the idea of "runtime library selection" touches on related concepts on several platforms. Avoid that scope creep by simply defining an abstraction that applies only when targeting the MSVC ABI on Windows. Removing the old default flags requires a policy because existing projects may rely on string processing to edit them and choose a runtime library under the old behavior. Add policy CMP0091 to provide compatibility. Fixes: #19108
| * | | | | | VS: Fix Fortran runtime library flag map special case for '-' optionsBrad King2019-04-101-4/+4
| | | | | | |
* | | | | | | 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.
generated by cgit v0.12 at 2025-01-15 13:43:56 (GMT)