Brad King
2f16e60843
Merge topic 'ninja-version-handling'
...
874e70bc
Ninja: Prevent generating if installed Ninja version is too old.
c5ac2b9d
Ninja: Centralized required Ninja version numbers and comparisons.
2015-08-10 09:13:24 -04:00
Brad King
815a2c09d3
Merge topic 'fix-process-error-handling'
...
203b20df
cmcmd: Improve error handling when executing a process.
b28b07db
cmCTestCoverageHandle: Improve error handling.
2015-08-10 09:13:22 -04:00
Brad King
16b889da9a
Merge topic 'fix-get-filename-component'
...
d035e968
get_filename_component: Fix bug where CACHE was ignored.
38ed5866
get_filename_component: Added initial tests for PROGRAM component.
772ca69f
get_filename_component: Tests now check for proper CACHE usage.
2015-08-10 09:13:20 -04:00
Brad King
3d0a719b70
Merge topic 'change-nmake-env-warning'
...
afeb4eb2
nmake/jom: Only warn about bad VS environment if compiler not found.
2015-08-10 09:13:18 -04:00
Brad King
e8592e555f
Merge topic 'fix-TARGET_FILE-imported'
...
35aab9df
Reject TARGET_PDB_FILE for imported targets instead of crashing
2015-08-10 09:13:16 -04:00
Kitware Robot
7979e25c8b
CMake Nightly Date Stamp
2015-08-10 00:01:09 -04:00
James Johnston
874e70bc57
Ninja: Prevent generating if installed Ninja version is too old.
2015-08-09 13:51:35 -04:00
James Johnston
c5ac2b9df3
Ninja: Centralized required Ninja version numbers and comparisons.
2015-08-09 13:31:24 -04:00
Kitware Robot
cf4bbf734c
CMake Nightly Date Stamp
2015-08-09 00:01:05 -04:00
James Johnston
203b20df98
cmcmd: Improve error handling when executing a process.
2015-08-08 01:06:27 -04:00
James Johnston
b28b07db47
cmCTestCoverageHandle: Improve error handling.
2015-08-08 00:28:38 -04:00
Kitware Robot
101ba25e6a
CMake Nightly Date Stamp
2015-08-08 00:01:08 -04:00
Stephen Kelly
29886ce764
cmTarget: Use a simpler delete algorithm.
...
This way, the methods can be moved without requiring a local algorithm.
The containers use automatic storage.
2015-08-07 21:55:17 +02:00
Stephen Kelly
197f4de110
cmTarget: Split storage of compile definitions from genexes.
2015-08-07 17:06:19 +02:00
Stephen Kelly
44e071aeff
cmTarget: Split storage of compile features from genexes.
2015-08-07 17:06:18 +02:00
Stephen Kelly
772ecef4b8
cmTarget: Split storage of compile options from genexes.
2015-08-07 17:06:17 +02:00
Stephen Kelly
1f54bc1cf3
cmTarget: Split storage of include directories from genexes.
2015-08-07 17:06:15 +02:00
Stephen Kelly
7568199b4d
cmTarget: Request only the link libraries where needed.
2015-08-07 17:06:15 +02:00
Kitware Robot
3cefadbff0
CMake Nightly Date Stamp
2015-08-07 00:01:07 -04:00
Stephen Kelly
6d8a125e49
cmQtAutoGenerators: Prefer a generator to access global generator.
2015-08-07 04:10:29 +02:00
Stephen Kelly
5f66900e71
cmGlobalGenerator: Port Find API to cmMakefile.
2015-08-07 04:10:29 +02:00
Stephen Kelly
c5b8841fd9
cmGlobalGenerator: Create global targets from cmMakefiles.
2015-08-07 04:10:29 +02:00
Stephen Kelly
8f75ea3b5e
cmGlobalGenerator: Port global target creation to cmMakefile.
2015-08-07 04:10:29 +02:00
Stephen Kelly
56f0540b51
cmGlobalGenerator: Port Configure-time check to cmMakefile.
...
This uses no generate-time state.
2015-08-07 04:10:29 +02:00
Stephen Kelly
19b546ef76
cmGlobalGenerator: Base final target property computation on Makefiles.
2015-08-07 04:10:29 +02:00
Stephen Kelly
f8be9ba9c2
cmGlobalGenerator: Base progress on Makefiles, not LocalGenerators.
2015-08-07 04:10:28 +02:00
Stephen Kelly
bc1097e3d9
cmExportLibraryDependenciesCommand: Port to cmMakefile.
2015-08-07 04:10:28 +02:00
Stephen Kelly
204aecdf82
cmGlobalGenerator: Port configure-time code to cmMakefile.
2015-08-07 04:10:28 +02:00
Stephen Kelly
3dd6f0a5bc
cmake: Port configure-time code to cmMakefile.
2015-08-07 04:10:28 +02:00
Stephen Kelly
73e4df99cb
cmGlobalGenerator: Store a container of cmMakefiles.
...
For use at configure-time.
2015-08-07 04:10:28 +02:00
Stephen Kelly
193699376a
cmGeneratorTarget: Port internal type to cmGeneratorTarget.
2015-08-07 04:10:28 +02:00
Stephen Kelly
32f131b0ca
cmGeneratorTarget: Prefer the local generator to access the global.
2015-08-07 04:10:28 +02:00
Stephen Kelly
10040601a2
cmLinkImplementationLibraries: Move to namespace scope.
2015-08-07 00:51:49 +02:00
Stephen Kelly
d9da6ee29f
cmLinkItem: Split to separate file.
2015-08-07 00:51:45 +02:00
Stephen Kelly
27252b2414
cmComputeLinkInformation: Simplify generator object access.
2015-08-07 00:51:40 +02:00
Stephen Kelly
1689c91d8d
cmMakefile: Remove unused method.
2015-08-07 00:32:15 +02:00
Stephen Kelly
dd11f72ced
cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.
2015-08-07 00:32:15 +02:00
James Johnston
d035e9687a
get_filename_component: Fix bug where CACHE was ignored.
...
If PROGRAM_ARGS is provided to get_filename_component, fix bug where the
command failed to honor the CACHE argument.
Added test cases to RunCMake.get_filename_component that fail when the
bug is not fixed to prevent regressions.
Signed-off-by: James Johnston <johnstonj.public@codenest.com>
2015-08-06 17:53:34 +00:00
James Johnston
38ed5866ed
get_filename_component: Added initial tests for PROGRAM component.
...
The RunCMake.get_filename_component test now tests basic functionality
of the PROGRAM component argument of get_filename_component.
Signed-off-by: James Johnston <johnstonj.public@codenest.com>
2015-08-06 17:53:25 +00:00
James Johnston
772ca69f80
get_filename_component: Tests now check for proper CACHE usage.
...
The RunCMake.get_filename_component test was improved to assert that
each test variable outputted by get_filename_component is or is not
a cache variable, as per the particular test.
Signed-off-by: James Johnston <johnstonj.public@codenest.com>
2015-08-06 17:53:12 +00:00
James Johnston
afeb4eb243
nmake/jom: Only warn about bad VS environment if compiler not found.
...
nmake and jom generators no longer warn about missing INCLUDE/LIB
environment variables unless the C/CXX compiler cannot be found. This
is useful if the user does not want to use these generators with the
Visual C++ compiler, or they do not want to enable any language.
2015-08-06 17:32:43 +00:00
Brad King
35aab9df9f
Reject TARGET_PDB_FILE for imported targets instead of crashing
...
Reported-by: Justin Borodinsky <justin.borodinsky@gmail.com>
2015-08-06 09:42:31 -04:00
Brad King
22590805bf
Merge topic 'cpack-rpm-documentation-fixes'
...
94226751
Tests/RunCMake/CPack: Add dependencies tests
105011e0
Tests/RunCMake/CPack: Bump verify result cmake version
d882d477
Tests/RunCMake/CPack/DEB: Add getPackageInfo helper function
145735b7
Tests/RunCMake/CPack: Enable CXX language in tests
e26f53a8
CPack/RPM: missing PACKAGE_CONFLICTS documentation
64aacb24
CPack/RPM: undocumented variables
2015-08-06 09:38:33 -04:00
Brad King
91c1b13d6e
Merge topic 'ninja-LINK_DEPENDS'
...
43c94281
Ninja: Honor the LINK_DEPENDS target property (#14796 )
2015-08-06 09:38:31 -04:00
Brad King
78141e799c
Merge topic 'install-no-runtime-deps-by-default'
...
26f5445b
Do not install 3rd-party dependencies by default
2015-08-06 09:38:29 -04:00
Brad King
55706506c7
Merge topic 'use-generator-target'
...
a309409e
cmOrderDirectories: Port to cmGeneratorTarget.
f83e8402
cmGeneratorTarget: Move CompileInfoMap from cmTarget.
b3f0e353
cmGeneratorTarget: Move GetCompilePDBDirectory from cmTarget.
34c43741
cmGeneratorTarget: Move GetOutputName from cmTarget.
4329a71c
cmComputeLinkDepends: Port to cmGeneratorTarget.
c93230ac
cmComputeLinkInformation: Port to cmGeneratorTarget.
ee26add4
cmGeneratorTarget: Move IsBundleOnApple from cmTarget.
c8a5f5ae
cmMakefileTargetGenerator: Add accessor for GeneratorTarget.
f8076644
cmGeneratorTarget: Move GetLinkClosure from cmTarget.
7c809fa2
cmGeneratorTarget: Move GetLinkerLanguage from cmTarget.
6da99de3
cmGeneratorTarget: Move GetFrameworkDirectory from cmTarget.
d6bb319b
cmGeneratorTarget: Move GetFullName from cmTarget.
7a460852
cmGeneratorTarget: Move GetAppBundleDirectory from cmTarget.
d560bfd2
cmGeneratorTarget: Move GetInstallNameDir* from cmTarget.
89e2a080
cmGeneratorTarget: Move GetMacContentDirectory from cmTarget.
62720e44
cmGeneratorTarget: Move GetFullNameComponents from cmTarget.
...
2015-08-06 09:38:27 -04:00
Brad King
73e3de381d
Merge topic 'cmState-policies'
...
757a1f54
cmState: Move PolicyState from cmMakefile.
52dbe654
cmState: Record the end position of each directory.
65a5e0c6
cmLinkedTree: Add Clear API.
34835433
cmState: Add Type for policy scope.
af0de01c
cmState: Remove call stack parent tracking.
6ae8b30b
cmMakefile: Move policy barriers inside cmState scopes.
a5fc17b5
cmMakefile: Re-order policy entries and barriers.
0a01e6c6
cmState: Add Snapshot Type accessor.
f0005bb4
Tests: Verify generate-time policy scope behavior.
2015-08-06 09:38:24 -04:00
Brad King
370e2c6785
Merge topic 'refactor-evaluation-files'
...
12c3f248
cmGeneratorExpressionEvaluationFile: Require generator context.
6c0e9ee2
cmMakefile: Store EvaluationFiles.
2015-08-06 09:38:22 -04:00
Brad King
4f0a6d462e
Merge topic 'compiler-version-Fortran'
...
f0609182
Fortran: Store detected compiler version persistently (#15684 )
2015-08-06 09:38:20 -04:00
Brad King
d356bced9b
Merge topic 'fix-missing-subdir-error'
...
c4d2f64f
add_subdirectory: Fix error message on missing CMakeLists.txt (#15680 )
2015-08-06 09:38:17 -04:00