reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-11 13:24:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
27,770 Commits 4 Branches 185 Tags 113 MiB
54d6a9187f
Commit Graph

27770 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Kelly
54d6a9187f cmMakefile: Rename GetCurrent{Output,Binary}Directory. 
Match names used in CMake code.
 2015-04-21 00:12:52 +02:00
Stephen Kelly
55d80d0a85 cmMakefile: Rename GetCurrent{,Source}Directory. 
Match the names used in cmake code.
 2015-04-21 00:12:52 +02:00
Stephen Kelly
b23cf06f86 cmake: Remove redundant start directories. 
They are maintained as containing the same content as the 'home'
directories, but they are never read from.

Fix some comments and help strings which confused the two by
name. They actually mean what is called CMAKE_SOURCE_DIR in
cmake code.
 2015-04-21 00:12:51 +02:00
Stephen Kelly
fcf246acd1 cmMakefile: Populate Home directories on initialize. 2015-04-21 00:12:51 +02:00
Stephen Kelly
8878bea7b6 cmake: Initialize Home directories on cmake for find-package mode. 
The Home directories can be used to initialize cmMakefile directories
internally.
 2015-04-21 00:12:51 +02:00
Stephen Kelly
044dc81504 Use the Home directories from the cmake class where intended. 2015-04-21 00:12:51 +02:00
Stephen Kelly
d67e8f24b8 cmake: Fix directory used to find the cache 
The start and home directories are the same, but the intent of the
code here is to use what is currently called the HomeOutput directory.
 2015-04-21 00:12:51 +02:00
Stephen Kelly
1ea085d1b6 cmMakefile: Initialize dir definitions early. 2015-04-21 00:12:51 +02:00
Stephen Kelly
f034bb2f54 Remove redundant calls to MakeStartDirectoriesCurrent. 
The SetStart{,Output}Directory methods do what it does.
 2015-04-21 00:12:51 +02:00
Stephen Kelly
3a68c323ba cmMakefile: Fix wrong parameter names. 2015-04-21 00:12:51 +02:00
Brad King
f438cd3731 Merge topic 'clean-up-ReadListFile' 
05245b42 cmMakefile: Move some preamble out of the Internal method.
6e23a4bd cmMakefile: Remove always-null first parameter to ReadListFile.
d21ebcb2 cmMakefile: Swap parameters of calls to ReadListFile.
95a27267 cmMakefile: Extract conditional code to caller.
7d248547 cmMakefile: Remove intermediate variable.
9db15954 cmMakefile: Move condition to the only calling context where it is true.
5d4480a8 cmMakefile: Populate CMAKE_PARENT_LIST_FILE in callers.
3a8ac242 cmMakefile: Collapse nested conditional.
5947d9b0 cmMakefile: Convert filenametoread into a std::string.
e2d0e0fb cmMakefile: Remove intermediate variable.
3a1ad171 cmMakefile: Combine duplicate condition.
f0dae032 cmMakefile: Re-order independent statements.
08da8742 cmMakefile: Split a conditional.
3dc4fe02 cmMakefile: Re-order independent variable setting.
e4f8f1f1 cmMakefile: Remove intermediate variable.
2d6121a9 cmMakefile: Remove use of intermediate variable.
...
 2015-04-20 14:37:05 -04:00
Brad King
5e0e65c189 Merge topic 'add-GreenHills-MULTI-generator' 
66b641f4 Help: Add notes for topic 'add-GreenHills-MULTI-generator'
48004d9d Add a 'Green Hills MULTI' generator on Windows
051d8be1 cmLocalGenerator: Constify some cmTarget and cmGeneratorTarget arguments
 2015-04-20 14:02:52 -04:00
Brad King
8056dda8a2 Merge topic 'doc-PDB_NAME-fallback' 
164f1df2 Help: Clarify PDB_NAME fallback behavior (#15518)
 2015-04-20 14:02:50 -04:00
Brad King
da65528c36 Merge topic 'stable-xcode-projects' 
6693590f Xcode: Refine quoting rules for Strings
a6331eb8 Xcode: Let PrintComment decide if the comment is non-empty
6e8952c1 Xcode: PrintComment will prepend a whitespace itself before the comment
4bd2544b Xcode: Do not add whitespace after attribute group opening brace
5cb4c838 Xcode: Properly indent PBXFileReference and PBXBuildFile
a723427b Xcode: Remove extra space in PBXProject comment
2fe8bca5 Xcode: Add comment after root object
2e0e205e Xcode: Indent using tabs
7b68c8df Xcode: Sort Xcode objects by Id
 2015-04-20 14:02:48 -04:00
Brad King
66b641f443 Help: Add notes for topic 'add-GreenHills-MULTI-generator' 2015-04-20 13:55:40 -04:00
Geoff Viola
48004d9dbe Add a 'Green Hills MULTI' generator on Windows 
Green Hills MULTI is an IDE for embedded real-time systems.  The IDE's
product page can be found here:

 http://www.ghs.com/products/MULTI_IDE.html

It supports cross compiling on ARM, Intel x86, and other architectures
with various operating systems.  The IDE exists on Linux and Windows
host systems, but CMake will currently only generate the project files
on Windows host systems.
 2015-04-20 13:55:40 -04:00
Kitware Robot
73ff279d07 CMake Nightly Date Stamp 2015-04-20 00:01:04 -04:00
Kitware Robot
4c00a37289 CMake Nightly Date Stamp 2015-04-19 00:01:06 -04:00
Stephen Kelly
05245b4229 cmMakefile: Move some preamble out of the Internal method. 2015-04-18 15:31:18 +02:00
Stephen Kelly
6e23a4bddd cmMakefile: Remove always-null first parameter to ReadListFile. 2015-04-18 15:31:18 +02:00
Stephen Kelly
d21ebcb244 cmMakefile: Swap parameters of calls to ReadListFile. 
The version with a null first parameter is now equivalent.
 2015-04-18 15:31:18 +02:00
Stephen Kelly
95a27267da cmMakefile: Extract conditional code to caller. 2015-04-18 15:31:17 +02:00
Stephen Kelly
7d24854736 cmMakefile: Remove intermediate variable. 2015-04-18 15:31:17 +02:00
Stephen Kelly
9db1595410 cmMakefile: Move condition to the only calling context where it is true. 
Call the Internal method with equivalent parameters, passing a null first
argument.

A duplicate path computation exists inside the external_in condition now,
but that is harmless at this point.
 2015-04-18 15:31:11 +02:00
Stephen Kelly
5d4480a8c7 cmMakefile: Populate CMAKE_PARENT_LIST_FILE in callers. 
Because all external callers of this method pass a null first
parameter, this change has no effect for them.

This also makes it obvious that the CMAKE_PARENT_LIST_FILE is set to
the name of the file being read itself for CMakeLists.txt files,
which may not make any sense.
 2015-04-18 15:29:20 +02:00
Stephen Kelly
3a8ac2423e cmMakefile: Collapse nested conditional. 2015-04-18 15:29:19 +02:00
Stephen Kelly
5947d9b031 cmMakefile: Convert filenametoread into a std::string. 
Remove other intermediate variables.
 2015-04-18 15:29:19 +02:00
Stephen Kelly
e2d0e0fbeb cmMakefile: Remove intermediate variable. 2015-04-18 15:29:19 +02:00
Stephen Kelly
3a1ad1713f cmMakefile: Combine duplicate condition. 2015-04-18 15:29:19 +02:00
Stephen Kelly
f0dae032ee cmMakefile: Re-order independent statements. 2015-04-18 15:29:19 +02:00
Stephen Kelly
08da874270 cmMakefile: Split a conditional. 2015-04-18 15:29:19 +02:00
Stephen Kelly
3dc4fe02e6 cmMakefile: Re-order independent variable setting. 2015-04-18 15:29:19 +02:00
Stephen Kelly
e4f8f1f1b7 cmMakefile: Remove intermediate variable. 2015-04-18 15:29:18 +02:00
Stephen Kelly
2d6121a9a7 cmMakefile: Remove use of intermediate variable. 2015-04-18 15:29:18 +02:00
Stephen Kelly
bdd4c5f5ba cmMakefile: Move variable definition above a condition. 2015-04-18 15:29:18 +02:00
Stephen Kelly
524ce89542 cmMakefile: Change condition to its equivalent. 
This makes it easier to reason about follow-up commits.
 2015-04-18 15:29:18 +02:00
Stephen Kelly
813cd719c4 cmMakefile: Determine the file to read before calling Internal. 2015-04-18 15:29:18 +02:00
Stephen Kelly
5c201f1ee6 cmMakefile: Remove duplication in ReadListFile. 2015-04-18 15:29:18 +02:00
Stephen Kelly
0d9555779d cmMakefile: Delegate ListFile reading to internal method. 2015-04-18 15:29:17 +02:00
Stephen Kelly
846608f267 cmMakefile: Remove useless condition. 2015-04-18 15:29:17 +02:00
Stephen Kelly
a2f2aeee2f cmMakefile: Add wrapper for reading listfiles which have an origin. 
Such files are delegates from other files, and so they set the
CMAKE_PARENT_LIST_FILE to the originator.  They also may set a
policy scope.
 2015-04-18 15:29:17 +02:00
Stephen Kelly
68f791cd06 cmMakefile: Add a method for processing buildsystem files. 
These are different from other ListFiles in that a project() command is
required if it is top-level.
 2015-04-18 15:29:17 +02:00
Stephen Kelly
5bb4248a80 cmMakefile: Remove fullPath parameter from ReadListFile. 
There is no reason for this to be a responsibility of
ReadListFile.  Additionally, the only user of it already computes
it itself.
 2015-04-18 15:29:17 +02:00
Stephen Kelly
fc7ab8874b CPack: Read the config listfile in the normal way. 
This is a unique function call in CMake, and it was likely a
programming error when introduced.  All other similar calls to
ReadListFile use a null first paramter.

The effect of this patch is to no-longer define CMAKE_PARENT_LIST_FILE
to the config file itself while evaluating it.

The ReadListFile method also no longer hits a condition that it uses
CollapseFullPath on the input file.  However, as cpack does not
set the StartDirectory anyway, this has no effect. See bug 15522.
 2015-04-18 15:26:12 +02:00
Kitware Robot
a0bc4a999d CMake Nightly Date Stamp 2015-04-18 00:01:06 -04:00
Gregor Jasny
6693590f81 Xcode: Refine quoting rules for Strings 
$ and . do not need to be quoted, but brackets and * must be to
not confuse the Xcode parser.
 2015-04-17 21:50:05 +02:00
Gregor Jasny
a6331eb851 Xcode: Let PrintComment decide if the comment is non-empty 2015-04-17 21:50:05 +02:00
Gregor Jasny
6e8952c193 Xcode: PrintComment will prepend a whitespace itself before the comment 2015-04-17 21:50:05 +02:00
Gregor Jasny
4bd2544b25 Xcode: Do not add whitespace after attribute group opening brace 
This suppresses the extra space that would be generated if the
separator is a space. The conditional block is also used in this
form elsewhere.
 2015-04-17 21:50:04 +02:00
Gregor Jasny
5cb4c8380d Xcode: Properly indent PBXFileReference and PBXBuildFile 
Move indent factor change behind indention of start-of-line.
 2015-04-17 21:50:04 +02:00