summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-01-221-1/+2
|\ | | | | | | | | * upstream-KWSys: KWSys 2019-01-22 (4fecfe6f)
| * KWSys 2019-01-22 (4fecfe6f)KWSys Upstream2019-01-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 4fecfe6f29be07ec165bcc87a20666425d928aa6 (master). Upstream Shortlog ----------------- Brad King (1): 7a5e5af8 SystemTools: Revert "Fix FileIsSymlink with Windows data deduplication" Tobias Kloss (1): ef373416 SystemTools: Fix FileIsSymlink with Windows data deduplication Wouter Klouwen (1): 8e9970fb SystemInformation: support BSD platforms for GetProcessId
* | Merge topic 'crosscompiling_emulator-fix'Brad King2019-01-222-1/+7
|\ \ | | | | | | | | | | | | | | | | | | ab3b549ee0 CROSSCOMPILING_EMULATOR: Fix test generation for empty value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2834
| * | CROSSCOMPILING_EMULATOR: Fix test generation for empty valueKyle Edwards2019-01-212-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | If CROSSCOMPILING_EMULATOR was set to an empty string, and a test was generated with the executable as the command, CMake would segfault upon trying to generate the test file. Fix this. Fixes: #18819
* | | Merge topic 'findgit-imported-target'Brad King2019-01-226-0/+63
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 97700e9f5b FindGit: Add imported target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2790
| * | | FindGit: Add imported targetKyle Edwards2019-01-216-0/+63
| |/ /
* | | Merge topic 'Wcomma'Brad King2019-01-225-11/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5ff7fb592e Fixed all but one clang -Wcomma warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2828
| * | | Fixed all but one clang -Wcomma warningSean McBride2019-01-125-11/+13
| | | |
* | | | Merge topic 'stdout-string'Brad King2019-01-229-56/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3132ea801c cmSystemTools: Stdout(),Stderr() accept std::string argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2829
| * | | | cmSystemTools: Stdout(),Stderr() accept std::string argumentVitaly Stakhovsky2019-01-209-56/+42
| | | | |
* | | | | Merge topic 'depends-string'Brad King2019-01-2210-73/+76
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c50a72576 cmDepends: all members accept std::string arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2827
| * | | | | cmDepends: all members accept std::string argumentsVitaly Stakhovsky2019-01-1910-73/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most `const char*` arguments converted to `const std::string&` in `cmDepends` and derived classes. In addition performed minor code cleanup.
* | | | | | Merge topic 'cmake-gui-generator-platform'Brad King2019-01-2215-29/+341
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67bced8a26 cmake-gui: Improve label for default platform 48ec0bc140 cmake-gui: Add field for generator platform selection 8bba458ea5 Add global generator factory method to get default platform name 818df52c48 Add global generator factory method to get list of known platforms 8144b00e32 Split global generator factory list with and without platforms b70c0aed5c VS: Factor out helper function to compute host platform name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2832
| * | | | | | cmake-gui: Improve label for default platformJulien Jomier2019-01-212-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify the default platform to be used when the platform field is empty
| * | | | | | cmake-gui: Add field for generator platform selectionJulien Jomier2019-01-185-4/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the "first configure" dialog with a field for the user to select a value for `CMAKE_GENERATOR_PLATFORM`. Fixes: #17343
| * | | | | | Add global generator factory method to get default platform nameBrad King2019-01-1810-0/+26
| | | | | | |
| * | | | | | Add global generator factory method to get list of known platformsBrad King2019-01-1810-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `cmGlobalGeneratorFactory::GetKnownPlatforms` method to return a list of known possible values for `CMAKE_GENERATOR_PLATFORM`. Implement the method for each generator by referencing the list of possible values documented in `Help/generator/*.rst` for it. Co-Author: Julien Jomier <julien.jomier@kitware.com>
| * | | | | | Split global generator factory list with and without platformsBrad King2019-01-1810-15/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace `cmGlobalGeneratorFactory::GetGenerators` with a pair of methods to split the list of generator names into those that have platforms in the name and those that do not.
| * | | | | | VS: Factor out helper function to compute host platform nameBrad King2019-01-181-10/+15
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2019-01-221-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'ExternalProject-non-cmake-source-subdir'Brad King2019-01-215-2/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c09ec79981 ExternalProject: support SOURCE_SUBDIR for BUILD_IN_SOURCE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2823
| * | | | | ExternalProject: support SOURCE_SUBDIR for BUILD_IN_SOURCEBen Boeckel2019-01-175-2/+49
| | | | | |
* | | | | | Merge topic 'read-list-file'Brad King2019-01-2115-47/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25caf7bafe cmMakefile::ReadListFile() accepts std::string argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2821
| * | | | | | cmMakefile::ReadListFile() accepts std::string argumentVitaly Stakhovsky2019-01-1715-47/+42
| |/ / / / / | | | | | | | | | | | | | | | | | | Same for cmMakefile::ReadDependentFile(); some cleanup
* | | | | | Merge topic 'fortran-compiler-id'Brad King2019-01-2114-4/+127
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a080914274 Fortran: Add compiler ID/Version generator expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2804
| * | | | | | Fortran: Add compiler ID/Version generator expressionsAndrew Paprocki2019-01-1814-4/+127
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `Fortran_COMPILER_ID` and `Fortran_COMPILER_VERSION` generator expression support to match equivalent `C_COMPILER_ID`, `CXX_COMPILER_ID`, `C_COMPILER_VERSION`, and `CXX_COMPILER_VERSION` support. This is very helpful in the case where the C/C++ compiler suite is a different type of compiler from the platform Fortran compiler and projects use generator expressions to assign compiler flags and definitions. (e.g. `GNU` C/C++ and `SunPro` Fortran on Linux)
* | | | | | Merge topic 'update-libuv'Brad King2019-01-2198-3144/+3400
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b3af28e45 libuv: Update CMake-internal buildsystem 1136275ae1 libuv: Include uv/ headers from each other without any path 1e1209729b Merge branch 'upstream-libuv' into update-libuv 4fcb0d0213 libuv 2019-01-15 (f84c5e69) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2822
| * | | | | | libuv: Update CMake-internal buildsystemBrad King2019-01-174-23/+31
| | | | | | |
| * | | | | | libuv: Include uv/ headers from each other without any pathBrad King2019-01-172-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Headers in `uv/` can include each other without the `uv/` prefix. Using the prefix assumes that the location of `uv/` is in the include file search path, but it is possible to include `uv.h` via a longer path.
| * | | | | | Merge branch 'upstream-libuv' into update-libuvBrad King2019-01-1794-3123/+3371
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-libuv: libuv 2019-01-15 (f84c5e69)
| | * | | | | | libuv 2019-01-15 (f84c5e69)libuv upstream2019-01-1694-3128/+3406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit f84c5e693b80cb0c62bcefba147e7a66e2b839c9 (v1.x).
* | | | | | | | Merge topic 'cmake-role-fix'Brad King2019-01-214-3/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 264bdac185 CMAKE_ROLE: Fix value for ctest --build-and-test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2820
| * | | | | | | | CMAKE_ROLE: Fix value for ctest --build-and-testKyle Edwards2019-01-184-3/+20
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --build-and-test builds a CMake project, so CMAKE_ROLE should be PROJECT. Fix this and add a test case.
* | | | | | | | Merge topic 'autogen_mocs_compilation_first'Brad King2019-01-216-20/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ed4d48dcf Autogen: Prepend instead of append `mocs_compilation.cpp` to the sources list a42b700cc2 cmTarget,cmGeneratorTarget: Add optional `before` parameter to AddSource Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Peter Wu <peter@lekensteyn.nl> Merge-request: !2815
| * | | | | | | | Autogen: Prepend instead of append `mocs_compilation.cpp` to the sources listSebastian Holtermann2019-01-182-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `mocs_compilation.cpp` easily takes a long time to compile when it contains multiple `moc` files. When it was appended like before we ran into the situation that all smaller sources were already compiled when `mocs_compilation.cpp` got compiled at last. In that case a single core was busy but all remaining cores stayed idle. To optimize CPU core utilization we now prepend `mocs_compilation.cpp` to the sources list instead of appending it. This allows smaller source files to get compiled *while* the long lasting `mocs_compilation.cpp` gets compiled. Closes #18793
| * | | | | | | | cmTarget,cmGeneratorTarget: Add optional `before` parameter to AddSourceSebastian Holtermann2019-01-184-16/+22
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new optional `before` parameter in `cmTarget::AddSource` and `cmGeneratorTarget::AddSource` allows to prepend a source file to the sources list instead of appending it.
* | | | | | | | Merge topic 'swift-module-name'Brad King2019-01-213-2/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ffe8f8844 Ninja: support `SWIFT_MODULE_NAME` property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2813
| * | | | | | | | Ninja: support `SWIFT_MODULE_NAME` propertySaleem Abdulrasool2019-01-183-2/+11
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new `SWIFT_MODULE_NAME` property that defaults to the target name. This is needed as otherwise, the first source file determines the module name. Issue: #18800
* | | | | | | | Merge topic 'use-emplace'Brad King2019-01-2158-271/+271
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef61997b1b clang-tidy: Use emplace 2e5307a2a4 CTestSVN: Accept std::string in SVNInfo constructor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2811
| * | | | | | | | clang-tidy: Use emplaceRegina Pfeifer2019-01-1757-269/+269
| | | | | | | | |
| * | | | | | | | CTestSVN: Accept std::string in SVNInfo constructorBrad King2019-01-172-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge topic 'ctest-json-polish'Brad King2019-01-219-11/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cae9d2a61a CTest: Teach --show-only= to reject unknown values 7370b02c36 CTest: Teach --show-only=json-v1 to filter out not-available tests 62fec84ad7 Tests: Fix RunCMake.CTestCommandLine case when no python is found 75a7a23746 Tests: Rename RunCMake.CTestCommandLine show-only test cases fecbc87608 Tests: Fix RunCMake.CTestCommandLine to actually check json-v1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2812
| * | | | | | | | CTest: Teach --show-only= to reject unknown valuesBrad King2019-01-175-0/+8
| | | | | | | | |
| * | | | | | | | CTest: Teach --show-only=json-v1 to filter out not-available testsBrad King2019-01-172-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid exposing the internal special value that we use to track tests not available in the tested configuration. This also prevents clients from having to do the filtering themselves.
| * | | | | | | | Tests: Fix RunCMake.CTestCommandLine case when no python is foundBrad King2019-01-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not try to run the python checks if the python executable is not available.
| * | | | | | | | Tests: Rename RunCMake.CTestCommandLine show-only test casesBrad King2019-01-175-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current name was chosen from an earlier design iteration of the command-line option name. Rename the case to match the final name.
| * | | | | | | | Tests: Fix RunCMake.CTestCommandLine to actually check json-v1Brad King2019-01-161-0/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a file missing from commit 67209a9291 (Tests: Add cases for ctest --show-only=json-v1, 2018-11-01) to actually hook up the content check.
* | | | | | | | Merge topic 'FindCURL-typo'Brad King2019-01-211-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0526ae4415 FindCURL: fix component failure when no pkg-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2826
| * | | | | | | | FindCURL: fix component failure when no pkg-configHiroshi Miura2019-01-211-2/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find_package(CURL COMPONENTS foo) fails when there is no pkg-config module because of variable name typo. Signed-off-by: Hiroshi Miura <miurahr@linux.com> Fixes: #18802
* | | | | | | | Merge topic 'command_file_link'Brad King2019-01-2115-3/+226
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f08ed8936 cmSystemTools: Silence CreateLink and CreateSymlink errors 593d986470 Tests: Avoid cross-device links in CREATE_LINK test 9a3d85cfc5 Tests: Skip symlink tests on Windows e68ea269d7 Tests: CREATE_LINK subcommand negative test case 45aa9c65a1 Tests: file CREATE_LINK subcommand test cases 8bb7562f1a Help: Add documentation for file(CREATE_LINK) subcommand 81650e488c cmFileCommand: Add CREATE_LINK subcommand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2759
generated by cgit v0.12 at 2025-01-17 04:07:32 (GMT)