Gregor Jasny
481420ee89
Xcode: Generate ZERO_CHECK generator target only once
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
8 years ago
Brad King
36fc89b7d9
Merge branch 'std-thread-link' into release-3.11
Merge-request: !1789
8 years ago
Brad King
94eee5e683
CMakeLib: Link to system thread libraries to support std::thread
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
8 years ago
Brad King
020be379f4
Merge topic 'fortran-compiler'
965f977c
Fortran: Adjust compiler candidates based on host platform
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1780
8 years ago
Brad King
5c0223886e
Merge topic 'setidentifier_move'
46436581
cmGeneratorExpression: Use std::move to avoid vector copies
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1779
8 years ago
Brad King
b0e2b256c8
Merge topic 'cmake-build-global-gen'
83f8e764
cmake: Fix global generator path style in --build mode
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1784
8 years ago
Brad King
8ac6c7e7f3
Merge topic 'test-ExternalProject-serial'
8a55ad2c
Tests: Run ExternalProject tests serially
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1783
8 years ago
Brad King
8d70cddd22
Merge branch 'release-3.11'
8 years ago
Brad King
dcb45a1161
Merge topic 'test-CompileFeatures-c11-range'
972f7caa
Tests: Make CompileFeatures C dialect check consistent with impl
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1785
8 years ago
Kitware Robot
a08ede979b
CMake Nightly Date Stamp
8 years ago
Vitaly Stakhovsky
b723fe3d7d
VS: Convert loops to C++11, other C++ improvements
8 years ago
Brad King
42793aeabc
Merge branch 'release-3.11'
8 years ago
Brad King
8f869ad716
Merge topic 'autogen-depend-filters-documentation'
bfffe42b
Autogen: Doc: Extend AUTOMOC_DEPEND_FILTERS documentation
1cf7c54a
Autogen: Doc: Extend AUTOGEN_TARGET_DEPENDS documentation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1782
8 years ago
Brad King
13c5a91197
Merge branch 'test-CompileFeatures-c11-range' into release-3.11
Merge-request: !1785
8 years ago
Brad King
972f7caad3
Tests: Make CompileFeatures C dialect check consistent with impl
`Modules/CMakeCCompilerId.c.in` will report the C dialect as 11 whenever
`__STDC_VERSION__` indicates *at least* C 11. Make the test consistent
with this. We already do this for the C++ case.
Fixes : #17740
8 years ago
Frank Winklmeier
46436581c6
cmGeneratorExpression: Use std::move to avoid vector copies
Use move semantics in GeneratorExpressionContent::SetIdentifier and
::SetParameters to avoid vector copies.
8 years ago
Brad King
fef001884f
Merge topic 'FindLua-tolerate-var'
6cced787
FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1778
8 years ago
Brad King
fcae625f48
Merge topic 'FindwxWidget/fix-eating-minusL-in-path'
67db3ff9
Fix eating "-L" in path names
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1775
8 years ago
Brad King
283562624c
Merge topic 'find-linker'
e936b6bb
CMakeFindBinUtils: Find linker in PATH
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1720
8 years ago
xoviat
e936b6bb5a
CMakeFindBinUtils: Find linker in PATH
Fixes : #17693
8 years ago
Brad King
d513a4035b
Merge branch 'autogen-depend-filters-documentation' into release-3.11
Merge-request: !1782
8 years ago
Sebastian Holtermann
bfffe42b98
Autogen: Doc: Extend AUTOMOC_DEPEND_FILTERS documentation
8 years ago
Sebastian Holtermann
1cf7c54a6b
Autogen: Doc: Extend AUTOGEN_TARGET_DEPENDS documentation
8 years ago
xoviat
965f977c7c
Fortran: Adjust compiler candidates based on host platform
Typical Fortran compiler command-line tool names differ on Windows and
non-Windows platforms. Also, the name `ifc` should not be used on
Windows because there is an `ifc.exe` tool in Visual Studio that is
unrelated.
Fixes : #17752
8 years ago
Brad King
83f8e76467
cmake: Fix global generator path style in --build mode
Fix the `--build` code path so that `cmSystemTools::SetForceUnixPaths`
is called with the global generator's path style. This makes forwarding
of `--target subdir/src.c.obj` match the slash style the generator
placed in the build system.
Fixes : #17742
8 years ago
Brad King
8a55ad2c5b
Tests: Run ExternalProject tests serially
These tests use a lot of resources, so run them separately from other
tests to avoid competition (which may cause spurious timeouts).
8 years ago
Kitware Robot
4e6f94d49c
CMake Nightly Date Stamp
8 years ago
Frank Benkstein
6cced78725
FindLua: Fix error when LUA_INCLUDE_PREFIX is set as a variable
We use `LUA_INCLUDE_PREFIX` for the result of an internal `find_path`
call and unset the cache entry before each use. Unset a plain variable
of this name too in case it was set by project code. Otherwise the
`find_path` call may be skipped and the wrong value used, leading to
errors.
8 years ago
Claus Klein
84de8b80ec
Ninja: Use as dependency file <objectDir/SourceName>.d if needed.
8 years ago
Brad King
b89252689c
Merge branch 'release-3.11'
8 years ago
Brad King
a8d182fbbf
Merge topic 'ti-depfile-flag-fix'
cab9af7e
Compiler/TI: Fix depfile generation for C++
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1774
8 years ago
Brad King
82c23d6afc
Merge branch 'ti-depfile-flag-fix' into release-3.11
Merge-request: !1774
8 years ago
Grzegorz Dobinski
cab9af7e97
Compiler/TI: Fix depfile generation for C++
In commit v3.11.0-rc1~466^2 (Compiler/TI: Add support for depfile
generation for Ninja, 2017-10-16) the flag for C++ was added in a
variable with a typo in its name. Fix the spelling.
Issue: #17360
8 years ago
Brad King
846a4dd118
Merge topic 'string-join'
689eeb67
string: Add JOIN subcommand
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com>
Merge-request: !1762
8 years ago
Brad King
8a99ccc5ed
Merge topic 'ninja-cmake-deps'
ed000d7d
Ninja: Don't add custom command outputs to phony rule for CMake inputs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1768
8 years ago
Brad King
10f39ca7f7
Merge topic 'msvc-parallel-build-17696'
a1dee224
CMake: Enable /MP for MSVC toolchain
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1718
8 years ago
Brad King
3bc3762c7c
Merge topic 'findzlib-folder-priority'
c01eede8
FindZLIB: Search names per directory
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1769
8 years ago
Brad King
1fbd5f4a7e
Merge topic 'CheckCSourceRuns-log-run-output'
b25b39ad
CheckCSourceRuns: Teach CHECK_C_SOURCE_RUNS to log run output
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1772
8 years ago
Brad King
088c1876ef
Merge topic 'follow-up-misc-typos'
287e7a17
Maint: misc. typos
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1771
8 years ago
Brad King
377254b195
Merge topic 'help_fixup'
1667e244
Help: Fix command references in CMAKE_NETRC* variable documentation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1770
8 years ago
Kitware Robot
31419815aa
CMake Nightly Date Stamp
8 years ago
Kitware Robot
a99ff558af
CMake Nightly Date Stamp
8 years ago
Kitware Robot
33ace6eb91
CMake Nightly Date Stamp
8 years ago
Raffi Enficiaud
67db3ff958
Fix eating "-L" in path names
When the path containing the wxLibraries contains a "-L", a "string(REPLACE "-L" ...)
replaces the content and results in a wrong path. The regex fixes this.
8 years ago
Kitware Robot
3b6fe84cb7
CMake Nightly Date Stamp
8 years ago
Alex Turbov
689eeb67cb
string: Add JOIN subcommand
This is just like CONCAT but accepts a glue string to put between
each value. `JOIN ""` is equivalent to `CONCAT`.
8 years ago
Edward Z. Yang
b25b39ad76
CheckCSourceRuns: Teach CHECK_C_SOURCE_RUNS to log run output
Signed-off-by: Edward Z. Yang <ezyang@fb.com>
Fixes : #17745
8 years ago
luz.paz
287e7a175c
Maint: misc. typos
Found via `codespell`
8 years ago
Brad King
eded0bae2e
Merge branch 'help_fixup' into release-3.11
Merge-request: !1770
8 years ago
Shane Parris
1667e24453
Help: Fix command references in CMAKE_NETRC* variable documentation
8 years ago