Commit Graph

24723 Commits

Author SHA1 Message Date
Kitware Robot
03fc2000c9 CMake Nightly Date Stamp 2018-06-21 00:01:08 -04:00
Brad King
6a55c8c603 Merge topic 'vs-cuda-no-host-includes'
543b6826ee VS: Avoid duplication of CUDA include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2158
2018-06-20 09:46:58 -04:00
Brad King
d1a37c25f5 Merge topic 'vs-cuda-maxrregcount'
4d3a3d7459 VS: Add CUDA flag table entry for -maxrregcount

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2156
2018-06-20 09:46:29 -04:00
Brad King
543b6826ee VS: Avoid duplication of CUDA include directories
We already place all include directories for CUDA inside `CudaCompile`
so we do not need to use any from `ClCompile`.  Tell `CudaCompile`
not to use the host compiler's include directory settings.

Fixes: #18101
2018-06-20 09:44:18 -04:00
Brad King
4d3a3d7459 VS: Add CUDA flag table entry for -maxrregcount
Fixes: #18104
2018-06-20 09:44:09 -04:00
Brad King
e11f660ae1 Merge topic 'xcode-10-legacy-build-system'
ca69206893 Tests: Do not use i386 architecture with Xcode 10 and above
71fa78ff7a Tests: Teach RunCMake to ignore Xcode missing file type warnings
057ecb8f6f C++ feature checks: Ignore Xcode warnings
985d3a162c Xcode: Use legacy build system

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2151
2018-06-20 09:42:25 -04:00
Kitware Robot
20f0423747 CMake Nightly Date Stamp 2018-06-20 00:01:10 -04:00
Brad King
00a9d133fb Merge topic 'install_from_another_directory'
e89ad0f94e install: Allow installing targets created in another directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2152
2018-06-19 11:50:51 -04:00
Gregor Jasny
057ecb8f6f C++ feature checks: Ignore Xcode warnings 2018-06-19 10:56:50 -04:00
Gregor Jasny
985d3a162c Xcode: Use legacy build system
Closes: #18099
2018-06-19 10:56:50 -04:00
Brad King
e893c53b8c Merge topic 'xcode-10-archs'
bc5bcad45e Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2153
2018-06-19 10:54:28 -04:00
Craig Scott
6e7b424240 Merge topic 'subdir_target_sources'
316815e1f4 target_sources: Interpret relative paths as relative to the calling directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2128
2018-06-19 08:24:08 -04:00
Kitware Robot
fa744586cc CMake Nightly Date Stamp 2018-06-19 00:01:09 -04:00
Patrick Stotko
316815e1f4 target_sources: Interpret relative paths as relative to the calling directory
Previously the command considered non-absolute source file paths relative to
the associated target on the LHS. This causes problems in incremental builds
where files are added from subdirectories and forces users to workaround by
manually converting to absolute paths. Change this to enable more intuitive
usage by projects.

Fixes #17981
2018-06-18 21:01:57 +02:00
Brad King
bc5bcad45e Xcode: Detect architecture(s) using ARCHS instead of CURRENT_ARCH
Xcode 10 no longer populates `CURRENT_ARCH` with the current
architecture in shell scripts and instead uses `undefined_arch`.
Instead we must use `ARCHS`.  It lists all architectures separated by
spaces.

Fixes: #18085
2018-06-18 13:44:43 -04:00
Zack Galbreath
e89ad0f94e install: Allow installing targets created in another directory
Previously, `install(TARGETS)` would only accept targets created in the same
directory scope.  Relax this restriction by searching the global scope when
determining whether or not a target exists.

Fixes: #14444
2018-06-18 13:18:54 -04:00
Brad King
b0b99d877e Merge topic 'find_program-conditional-cwd'
c76c1ea208 find_program: Consider CWD only for paths with separator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2120
2018-06-18 10:08:54 -04:00
Brad King
a75638c130 Merge topic 'update-kwsys'
4eae1c0816 Merge branch 'upstream-KWSys' into update-kwsys
f3cd44263e KWSys 2018-06-14 (2b0ca1d8)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2148
2018-06-18 10:07:38 -04:00
Kitware Robot
fe447879dd CMake Nightly Date Stamp 2018-06-18 00:01:12 -04:00
Kitware Robot
63fbff548e CMake Nightly Date Stamp 2018-06-17 00:01:09 -04:00
Kitware Robot
2eb4a16c21 CMake Nightly Date Stamp 2018-06-16 00:01:10 -04:00
Kitware Robot
d94997f0fe CMake Nightly Date Stamp 2018-06-15 00:01:06 -04:00
Sam Yates
c76c1ea208 find_program: Consider CWD only for paths with separator
find_program() incorrectly prepended search path components
to absolute file paths, and incorrectly searched the current
working directory for files that contained no directory
separators.

* Replace calls cmFindProgramHelper::CheckDirectory(std::string())
  with call of new method cmFindProgramHelper::CheckCompoundNames()
  that checks for the presence of a directory separator in the
  file name.
* Use cmSystemTools::CollapseCombinedPath rather than string
  concatenation to properly combine absolute file names with
  search path components.
* Add unit tests to verify corrections.

Fixes: #18044
2018-06-14 14:28:03 -04:00
Brad King
575f97763f Merge topic 'list_sort'
49a51a61d7 list: Add options to control the SORT comparison operation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2065
2018-06-14 13:55:57 -04:00
Brad King
4eae1c0816 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-06-14 (2b0ca1d8)
2018-06-14 11:26:37 -04:00
Kitware Robot
b367da75c1 CMake Nightly Date Stamp 2018-06-14 00:01:10 -04:00
Daniel Franke
49a51a61d7 list: Add options to control the SORT comparison operation 2018-06-13 14:06:29 -04:00
Brad King
ef5e2e8a62 Merge branch 'sphinx-info' into release-3.12
Merge-request: !2146
2018-06-13 10:52:11 -04:00
Brad King
985c78c7e1 Merge branch 'restore-windows-resources-through-link' into release-3.12
Merge-request: !2147
2018-06-13 10:52:01 -04:00
Brad King
aa155de860 Merge topic 'sphinx-info'
276e369813 Utilities/Sphinx: Add option to build and install Info manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2146
2018-06-13 10:50:14 -04:00
Brad King
38e4246f37 Merge topic 'restore-windows-resources-through-link'
4e6ff0ae24 Windows: Restore support for running CMake through a symlink

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2147
2018-06-13 10:44:45 -04:00
Kitware Robot
cfac183295 CMake Nightly Date Stamp 2018-06-13 00:01:12 -04:00
Brad King
4e6ff0ae24 Windows: Restore support for running CMake through a symlink
The change in commit v3.11.3~3^2 (cmSystemTools: Revert GetRealPath
implementation on Windows, 2018-05-29) broke the feature added by commit
v3.11.0-rc1~64^2 (Windows: Add support for running CMake tools through a
symlink, 2018-01-21).  Use `GetRealPathResolvingWindowsSubst` in the
latter code path to restore it.

Fixes: #17882
2018-06-12 11:15:50 -04:00
Orivej Desh
276e369813 Utilities/Sphinx: Add option to build and install Info manual
Add option `SPHINX_INFO` to enable the Sphinx 'texinfo' builder and use
the `makeinfo` tool to convert it to a `.info` file.
2018-06-12 10:25:37 -04:00
Kitware Robot
f49870e372 CMake Nightly Date Stamp 2018-06-12 00:01:03 -04:00
Kitware Robot
018bcf6043 CMake Nightly Date Stamp 2018-06-11 00:01:07 -04:00
Kitware Robot
55c3435ce9 CMake Nightly Date Stamp 2018-06-10 00:01:05 -04:00
Kitware Robot
980914dc27 CMake Nightly Date Stamp 2018-06-09 00:01:24 -04:00
Brad King
812eaa465c Merge topic 'LINK_OPTIONS'
66ea1a3795 LINK_OPTIONS: Add support of "LINKER:" prefix
c1f5a44b28 LINK_OPTIONS: Add new family of properties
8e28d2630a Makefile generator: link flags management refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !2033
2018-06-08 09:37:48 -04:00
Brad King
7766e57ff0 Merge topic 'ninja-win-rsp'
88365838b8 Ninja: Use native slashes to pass rsp files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2136
2018-06-08 09:33:46 -04:00
Brad King
c984bf668b Merge branch 'ninja-win-rsp' into release-3.12
Merge-request: !2136
2018-06-08 09:32:14 -04:00
Matthijs Kool
88365838b8 Ninja: Use native slashes to pass rsp files
Some tools on Windows (e.g. Embarcadero linkers) can't handle forward
slashes in paths to rsp files.
2018-06-08 09:31:23 -04:00
Brad King
733d3ac0e8 Merge topic 'install-code-script-genex'
6dad812143 install: Teach CODE,SCRIPT modes to evaluate generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2113
2018-06-08 09:28:43 -04:00
Kitware Robot
81fc1db0a6 CMake Nightly Date Stamp 2018-06-08 00:01:05 -04:00
Jon Chronopoulos
6dad812143 install: Teach CODE,SCRIPT modes to evaluate generator expressions
Fixes: #15785
2018-06-07 13:18:23 -04:00
Kitware Robot
f31d4ac7d6 CMake Nightly Date Stamp 2018-06-07 00:01:04 -04:00
Marc Chevrier
66ea1a3795 LINK_OPTIONS: Add support of "LINKER:" prefix 2018-06-06 17:22:41 +02:00
Marc Chevrier
c1f5a44b28 LINK_OPTIONS: Add new family of properties
This family enable to manage link flags

Three new properties:
* directory property: LINK_OPTIONS
* target properties: LINK_OPTIONS and INTERFACE_LINK_OPTIONS

Two new commands
* add_link_options(): to populate directory property
* target_link_options(): to populate target properties

Fixes: #16543
2018-06-06 17:22:39 +02:00
Marc Chevrier
8e28d2630a Makefile generator: link flags management refactoring 2018-06-06 17:02:33 +02:00
Kitware Robot
074bb25ca0 CMake Nightly Date Stamp 2018-06-06 00:01:08 -04:00