GitLab

Alex

David Cole authored Mar 20, 2012 and Kitware Robot committed Mar 20, 2012

c337c7e2 Ninja: Fix <OBJECT_DIR> substitution

David Cole authored Mar 20, 2012 and Kitware Robot committed Mar 20, 2012

93d5509b Merge branch 'ninja-object-library' into object-library
821037cf Merge branch 'xcode-object-library' into object-library
eb24c99c Merge branch 'object-library' into xcode-object-library
63d1be8b Xcode: Honor $<TARGET_OBJECTS:...> source expressions
020ba387 Merge branch 'object-library' into xcode-object-library
e8ea6158 Build object library targets in Xcode
8045e171 Pre-compute object file names before Xcode generation
247a1324 Allow txt files as ExtraSources in object library targets
b0635996 Add a default source group for object files.
be01f3b0 Xcode: Re-factor some existing methods into "FromPath" variants
2693dbe0 Merge branch 'object-library' into ninja-object-library
51997cb6 Ninja: Honor $<TARGET_OBJECTS:...> source expressions
23ec258f Merge branch 'object-library' into ninja-object-library
61124de4 Build object library targets in Ninja
f5b06cda Pre-compute object file names before Ninja generation
a2514f15 Simplify cmNinjaTargetGenerator using cmGeneratorTarget
...

David Cole authored Mar 20, 2012 and Kitware Robot committed Mar 20, 2012

5b8983ee Fix some typos in the docs comments.

Brad King authored Mar 19, 2012 and Kitware Robot committed Mar 19, 2012

0cf84472 find_package: additional test for checking the error message
56ae3f94 find_package: add test for setting Foo_FOUND to FALSE in a Config file
16c0c737 find_package: allow <pkg>Config.cmake to set <pkg>_FOUND to FALSE

Brad King authored Mar 19, 2012 and Kitware Robot committed Mar 19, 2012

805c1b21 Handle CPACK_MONOLITHIC_INSTALL in some rare use cases.

Brad King authored Mar 19, 2012 and Kitware Robot committed Mar 19, 2012

4576f40e CPack STGZ put execute permission on all packages files (component case)

Brad King authored Mar 19, 2012 and Kitware Robot committed Mar 19, 2012

9eb8e4b2 Write CMakeCache.txt atomically (#13040)

Brad King authored Mar 19, 2012 and Kitware Robot committed Mar 19, 2012

0f4dfa69 CPack: Use real path to PackageMaker to find its version file (#12621)
4693cf84 Xcode: Detect new default locations of Xcode 4.3 bits and pieces (#12621)

* ninja-object-library: (37 commits)
  Ninja: Honor $<TARGET_OBJECTS:...> source expressions
  Build object library targets in Ninja
  Pre-compute object file names before Ninja generation
  Simplify cmNinjaTargetGenerator using cmGeneratorTarget
  Ninja: Avoid using 'this' in member initializers
  Ninja: Fix for PDB files with spaces in the path.
  Ninja: Constify use of cmCustomCommand
  Ninja: add /DEF: flag to linker call
  Ninja: Add a cache option CMAKE_ENABLE_NINJA to enable the ninja generator.
  Ninja: Add friend struct so it can access the private ConvertToNinjaPath.
  Ninja: add .def file support
  Ninja: ensure the output dir exists at compile time
  Ninja: Remove an unnecessary variable
  Ninja: Use cmSystemTools::ExpandListArgument to split compile/link commands
  Ninja: Add a missed license header
  Ninja: CMake: Adapt Ninja generator for per-target include dirs
  Ninja: windows msvc: create for each target a .pdb file
  Ninja: Import library support for Windows
  Ninja: mark the Windows specific hacks with a comment only
  Ninja: disable unfinished Windows ninja support
  ...

* xcode-object-library:
  Xcode: Honor $<TARGET_OBJECTS:...> source expressions
  Build object library targets in Xcode
  Pre-compute object file names before Xcode generation
  Allow txt files as ExtraSources in object library targets
  Add a default source group for object files.
  Xcode: Re-factor some existing methods into "FromPath" variants
  Xcode: Re-factor code into GetObjectsNormalDirectory method

David Cole authored Mar 16, 2012 and Brad King committed Mar 19, 2012

Add objects from object libraries referenced using this syntax to the
set of objects linked in a target.

David Cole authored Mar 15, 2012 and Brad King committed Mar 19, 2012

Treat OBJECT libraries as STATIC libraries. The Xcode project file
format provides no way to avoid running the libtool so hide the
resulting .a away next to the object files as it should never be
referenced.  The object files will be left behind for reference by other
targets later.

Peter Kuemmel authored Mar 18, 2012 and Brad King committed Mar 19, 2012

Don't forget the subdirectories.

Brad King authored Mar 19, 2012 and Kitware Robot committed Mar 19, 2012

84852085 Ninja: shell escape $(CMAKE_SOURCE_DIR) and $(CMAKE_BINARY_DIR)
df847671 Ninja: add support for OBJECT_OUTPUTS, fix PrecompiledHeader test case
48eb7fc7 Ninja: Avoid using 'this' in member initializers
bba37dd5 Ninja: Fix for PDB files with spaces in the path.
ac800f49 Ninja: Constify use of cmCustomCommand
9a0d5a82 Ninja: add /DEF: flag to linker call
d40eebd8 Ninja: Add a cache option CMAKE_ENABLE_NINJA to enable the ninja generator.
8c634330 Ninja: Add friend struct so it can access the private ConvertToNinjaPath.
dbe3dce5 Ninja: add .def file support
f1bb08f5 Ninja: ensure the output dir exists at compile time
7a6b5f46 Ninja: Remove an unnecessary variable
80ff2102 Ninja: Use cmSystemTools::ExpandListArgument to split compile/link commands
d2731a37 Ninja: Add a missed license header
eabc9b0b Ninja: CMake: Adapt Ninja generator for per-target include dirs
bada88e8 Merge branch 'target-include-directories' into ninja-generator
54bd175e Ninja: windows msvc: create for each target a .pdb file
...

For example, when CPACK_<GEN>_COMPONENT_INSTALL and
CPACK_MONOLITHIC_INSTALL are both set. Previously, this
combination of variable settings produced an error without
any explanation. Now, in this case CPACK_MONOLITHIC_INSTALL wins
without trouble.
This is useful for when e.g. CPACK_ARCHIVE_COMPONENT_INSTALL is
globally on and one wants MONOLITHIC install for STGZ (but not
other generators). The same behavior may be obtained by re-setting
CPACK_ARCHIVE_COMPONENT_INSTALL to 0 but in any case the
'both set' case should have been handled without error.

David Cole authored Mar 14, 2012 and Brad King committed Mar 16, 2012

Necessary for the Xcode generator, in which the CMakeLists.txt
files are added as sources merely for convenient access, without
any associated custom command.

David Cole authored Mar 15, 2012 and Brad King committed Mar 16, 2012

...to avoid depending on cmSourceFile instances. Prep work for supporting
OBJECT_LIBRARY in the Xcode generator.

Add objects from object libraries referenced using this syntax to the
set of objects linked in a target.

Treat OBJECT libraries as STATIC libraries but leave out the archive
step.  The object files will be left behind for reference by other
targets later.

Implement cmGlobalGenerator::ComputeTargetObjects in the Ninja generator
to pre-compute all the object file names.  Use the results during
generation instead of re-computing it later.

Replace the classification of source files in this generator using that
computed by cmGeneratorTarget.

VS complains

 warning C4355: 'this' : used in base member initializer list

so initialize the member in the constructor body instead.

Bill Hoffman authored Mar 13, 2012 and Brad King committed Mar 16, 2012

This calls ConvertToOutputFormat on the PDB paths for pdb file paths
used in both library creation and the building of object files.

Describe the OBJECT library signature of add_library and the
$<TARGET_OBJECTS:...> expressions needed to use object libraries.
Also document the what is not allowed for object library targets.