summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* project: warn on metadata arguments missing valuesAlex Turbov2018-03-0710-3/+64
| | | | Warn if `DESCRIPTION` or `VERSION` is given without a following value.
* CMake Nightly Date StampKitware Robot2018-03-021-1/+1
|
* Merge topic 'object-library-export-as-interface'Brad King2018-03-0123-63/+123
|\ | | | | | | | | | | | | ea0ce73a19 install,export: Maybe transform OBJECT libraries to INTERFACE libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1811
| * install,export: Maybe transform OBJECT libraries to INTERFACE librariesBrad King2018-02-2823-63/+123
| | | | | | | | | | | | | | | | | | | | | | Teach the `install` and `export` commands to support installing and exporting `OBJECT` libraries without their object files. Transform them to `INTERFACE` libraries in such cases. For `install(TARGETS)`, activate this when no destination for the object files is specified. For `export`, activate this only under Xcode with multiple architectures when we have no well-defined object file locations to give to clients.
* | CMake Nightly Date StampKitware Robot2018-03-011-1/+1
| |
* | Merge topic 'doc_test_prop_WORKING_DIRECTORY'Craig Scott2018-02-281-2/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | 92a4c236f6 Help: Fix wrong default for WORKING_DIRECTORY test property Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !1806
| * | Help: Fix wrong default for WORKING_DIRECTORY test propertyCraig Scott2018-02-271-2/+4
| | |
* | | Merge topic 'co-compile-with-launcher'Brad King2018-02-283-36/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | eaf9f69d41 Fix combined use of compiler launcher with lint tools Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1791
| * | | Fix combined use of compiler launcher with lint toolsIlya A. Kriveshko2018-02-273-36/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using ccache with clang-tidy, ccache needs to wrap compiler invocation, rather than cmake invocation. But it needs to do it without affecting the command line that iwyu-like tools are receiving. With this fix, if __run_co_compile is used, compile launcher is passed using the new --launcher option, but if __run_co_compile is not needed, compiler launcher is prepended to the command line as before. To better illustrate the change: with this fix if running clang-tidy with CXX_COMPILER_LAUNCHER set to "/usr/bin/time;-p;ccache" (time -p added strictly for illustration purposes), the command line changes from: /usr/bin/time -p ccache cmake -E __run_co_compile \ --tidy=clang-tidy ... -- g++ ... to: cmake -E __run_co_compile \ --launcher="/usr/bin/time;-p;ccache" \ --tidy=clang-tidy ... -- g++ ... This allows the compiler to be run via the launcher, but leaves tidy (& friends) invocations unaffected. Fixes: #16493
* | | | Merge topic 'findjava-jar-in-dev-component'Brad King2018-02-281-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 596a7f262a FindJava: Add Java_JAR_EXECUTABLE to a component: Development Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1807
| * | | | FindJava: Add Java_JAR_EXECUTABLE to a component: DevelopmentGiel van Schijndel2018-02-271-4/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | All discovered executables were placed in a component, except for 'jar'. This forced the use of find_package(Java) without any component specification. This commit adds 'jar' to the 'Development' component, because that's what it's used for.
* | | | Merge topic 'ideoptions-string'Brad King2018-02-286-37/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8182ebca32 cmIDEOptions: use std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1804
| * | | | cmIDEOptions: use std::stringVitaly Stakhovsky2018-02-266-37/+40
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-02-281-1/+1
| | | | |
* | | | | Merge branch 'release-3.11'Brad King2018-02-270-0/+0
|\ \ \ \ \
| * | | | | CMake 3.11.0-rc2v3.11.0-rc2Brad King2018-02-271-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.11'Brad King2018-02-270-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'modules-restore-path-suffixes' into release-3.11Brad King2018-02-264-0/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1802
| * \ \ \ \ \ Merge branch 'unixtimefix' into release-3.11Brad King2018-02-262-4/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1800
* | \ \ \ \ \ \ Merge topic 'contract-plplot'Brad King2018-02-271-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4964fe1e Tests: Update PLplot contract test repository URL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1801
| * | | | | | | | Tests: Update PLplot contract test repository URLBrad King2018-02-261-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a `git://` protocol URL documented by the repository hosting infrastructure. After some updates to that infrastructure, the `https://` URL with the `.git` extension no longer works reliably.
* | | | | | | | Merge topic 'modules-restore-path-suffixes'Brad King2018-02-274-0/+11
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b1c1424 Modules: Restore recently removed search path suffixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1802
| * | | | | | | Modules: Restore recently removed search path suffixesBrad King2018-02-264-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.11.0-rc1~293^2~4 (Modules: Remove paths set as global Unix prefixes, 2017-11-20) removed `PATH_SUFFIXES` options that appeared to be used to cover subdirectories of the `PATHS` options that were also removed. However, the path suffixes also apply to other search paths and so should not be removed. Restore them. Fixes: #17760
* | | | | | | | Merge topic 'unixtimefix'Brad King2018-02-272-4/+4
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | e1cd936c Tests: Fix TIMESTAMP-UnixTime test under SOURCE_DATE_EPOCH=1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1800
| * | | | | | Tests: Fix TIMESTAMP-UnixTime test under SOURCE_DATE_EPOCH=1Bernhard M. Wiedemann2018-02-262-4/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was expecting timestamps on day 1 in 1970 to start at 86400 but they actually started at 0. This worked without `SOURCE_DATE_EPOCH=1` because after 1972, leap days compensated the offset. Fixes: #17762
* | | | | | CMake Nightly Date StampKitware Robot2018-02-271-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'extend_suppress_regeneration'Brad King2018-02-269-33/+80
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6ef4bc3 Document and extend the CMAKE_SUPPRESS_REGENERATION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1792
| * | | | | Document and extend the CMAKE_SUPPRESS_REGENERATION variableShane Parris2018-02-239-33/+80
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://gitlab.kitware.com/cmake/cmake/issues/16815
* | | | | | Merge topic 'outputconverter_speedup'Brad King2018-02-262-36/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ab3660a cmOutputConverter: Inline some functions and avoid string re-allocations Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com> Merge-request: !1788
| * | | | | | cmOutputConverter: Inline some functions and avoid string re-allocationsFrank Winklmeier2018-02-232-36/+37
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use std::string (with correct initial size) in cmOutputConverter::Shell__GetArgument instead of ostringstream. This avoids several re-allocations of the string buffer. In addition, convert some of the private static members into inline free functions to avoid function calls.
* | | | | | Merge topic 'getsource_optimize'Brad King2018-02-262-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d1e5ada cmMakefile: Improve performance of GetSource for known files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1764
| * | | | | | cmMakefile: Improve performance of GetSource for known filesFrank Winklmeier2018-02-232-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store "Known" files separately in KnownFileSearchIndex. This avoids creating the rather expensive cmSourceFileLocation object for source files that are already known. For large projects this results in a factor 3-4 speedup of cmGlobalGenerator::Compute().
* | | | | | | Merge topic 'ipo-support'Brad King2018-02-261-0/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a18147e9 MSVC,Clang,Flang: Add IPO support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1721
| * | | | | | | MSVC,Clang,Flang: Add IPO supportxoviat2018-02-231-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17692
* | | | | | | | Merge topic 'project-references-csharp-17678'Brad King2018-02-269-18/+107
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 076a356c VS: Support C# project references Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1752
| * | | | | | | | VS: Support C# project referencesRobert Dailey2018-02-239-18/+107
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When specifying a pure C# target in the `target_link_libraries()` call to another C++ target, a `<ProjectReference>` was setup for it (we wanted this) but also a corresponding `.lib` was added under `<AdditionalDependencies>` (we didn't want this). This change introduces a check that prevents `.lib` linker options from being used when the corresponding target for that library is a C# target. Fixes: #17678
* | | | | | | | Merge topic 'vs-cpp-improvements'Brad King2018-02-264-82/+58
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b723fe3d VS: Convert loops to C++11, other C++ improvements Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1786
| * | | | | | | | VS: Convert loops to C++11, other C++ improvementsVitaly Stakhovsky2018-02-224-82/+58
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-02-261-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-02-251-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-02-241-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'release-3.11'Brad King2018-02-230-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch '14297-partial-xcode-zero-check' into release-3.11Brad King2018-02-235-1/+26
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1790
| * \ \ \ \ \ \ \ Merge branch 'std-thread-link' into release-3.11Brad King2018-02-222-0/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1789
* | \ \ \ \ \ \ \ \ Merge topic 'ninja-depfile-name'Brad King2018-02-231-2/+20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84de8b80 Ninja: Use as dependency file <objectDir/SourceName>.d if needed. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1781
| * | | | | | | | | | Ninja: Use as dependency file <objectDir/SourceName>.d if needed.Claus Klein2018-02-201-2/+20
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic '14297-partial-xcode-zero-check'Brad King2018-02-235-1/+26
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 481420ee Xcode: Generate ZERO_CHECK generator target only once Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1790
| * | | | | | | | | Xcode: Generate ZERO_CHECK generator target only onceGregor Jasny2018-02-225-1/+26
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY has been enabled generate only the root-level ZERO_CHECK target so targets in subdirectories pick up the root generator target of ZERO_CHECK. For the case that CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY is not enabled more investigation and a proper and final fix is still needed. Issue: 14297
* | | | | | | | | Merge topic 'std-thread-link'Brad King2018-02-232-0/+3
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94eee5e6 CMakeLib: Link to system thread libraries to support std::thread Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Daniel Chabrowski <dantezstudio@gmail.com> Merge-request: !1789
| * | | | | | | | CMakeLib: Link to system thread libraries to support std::threadBrad King2018-02-222-0/+3
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some environments require linking to thread libraries for `std::thread`. Express this direct dependency of CMakeLib explicitly. Previously this was done indirectly through our bundled libuv, but that does not work when using a system libuv. Fixes: #17757