Skip to content
Snippets Groups Projects
  1. Jan 16, 2014
  2. Jan 15, 2014
  3. Jan 09, 2014
  4. Jan 08, 2014
  5. Jan 07, 2014
    • Ruslan Baratov's avatar
      Xcode: Fix storyboard view · 93fc5a53
      Ruslan Baratov authored and Brad King's avatar Brad King committed
      Since commit 56831461 (Xcode: Use explicitFileType to mark source types,
      2013-04-16) the Xcode generator prefers to use explicitFileType to tell
      Xcode about each source file type.  This works better than
      lastKnownFileType for some file types, but not for "file.storyboard".
      
      If storyboard file has attribute 'explicitFileType' it is displayed
      incorrectly (as raw xml).  Switch it back to 'lastKnownFileType'.
      93fc5a53
  6. Jan 06, 2014
  7. Jan 02, 2014
    • Brad King's avatar
      Replace <OBJECT_DIR> rule placeholder consistently (#14667) · 03f3b4e7
      Brad King authored
      The <OBJECT_DIR> placeholder is supposed to be the base intermediate
      files directory for the current target.  This is how it gets replaced
      during link line generation.  However, during compile line generation
      we replace it with the directory containing the current object file
      which may be a subdirectory.  Fix replacement of <OBJECT_DIR> in the
      generated compile lines to be the base intermediate files directory.
      
      This was expoxed by commit 42ba1b08 (VS: Separate compiler and linker
      PDB files, 2013-04-05) when we added a "/Fd<OBJECT_DIR>/" flag to the
      MSVC compile line in order to match the VS IDE default compiler program
      database location in the intermediate files directory.  For source files
      in a subdirectory relative to the current target this caused the wrong
      location to be used for the compiler program database.  This becomes
      particularly important when using precompiled headers.
      
      While at it, use the cmTarget::GetSupportDirectory method to compute the
      intermediate files directory for the current target instead of repeating
      the logic in a few places.
      03f3b4e7
  8. Dec 09, 2013
  9. Nov 18, 2013
    • Brad King's avatar
      VS: Map /Fd to ProgramDataBaseFileName for VS 7,8,9 (#14577) · bf1db496
      Brad King authored
      Since commit 42ba1b08 (VS: Separate compiler and linker PDB files,
      2013-04-05) the VS generators no longer add ProgramDataBaseFileName.
      Therefore we should allow projects to do so by mapping the /Fd option.
      For VS >= 10 our flag tables map /Fd to ProgramDataBaseFileName already.
      Add the mapping for VS 7, 8, and 9.
      bf1db496
  10. Nov 13, 2013
  11. Nov 05, 2013
  12. Nov 04, 2013
  13. Nov 03, 2013
    • Brad King's avatar
      CMP0022: Warn about a given target at most once · 0a561a03
      Brad King authored
      Since cmTarget::ComputeLinkInterface is called separately for each
      "head" target that links a target, the warning we produce when
      CMP0022 is not set could be repeated.  Add explicit logic to allow
      the warning to appear at most once.  Multiple copies of the warning
      for the same target are almost always identical and therefore
      redundant.  In the rare case that two copies of the warning are
      different, the second can appear in a future run after the first
      is fixed.
      0a561a03
  14. Nov 02, 2013
  15. Nov 01, 2013
    • Brad King's avatar
      Check for OBJECT_LIBRARY source files at start of generation · 5a2fc3d6
      Brad King authored
      Teach cmGlobalGenerator::CheckTargets to include OBJECT_LIBRARY targets
      in the check for source file existence.
      
      Extend the RunCMake.ObjectLibrary test to cover this case.
      5a2fc3d6
    • Brad King's avatar
      Genex: Reject $<TARGET_FILE:...> for object libraries (#14532) · d9605897
      Brad King authored
      Teach the cmGeneratorExpressionEvaluator filesystem artifact logic
      to reject OBJECT_LIBRARY targets since they have no main artifact.
      Without the explicit rejection evaluation falls through to an
      internal CMake error message in cmTarget::GetOutputInfo.
      
      Extend the RunCMake.GeneratorExpression test to cover these cases.
      d9605897
  16. Oct 26, 2013
    • Stephen Kelly's avatar
      Don't add invalid content to static lib INTERFACE_LINK_LIBRARIES. · 239b0c6b
      Stephen Kelly authored and Brad King's avatar Brad King committed
      Only valid target names or generator expressions may appear in
      the target field of a LINK_ONLY expression.
      
      Other content like link flags should still be added to that property
      (wrapped in config-specific generator expressions), but not wrapped
      in LINK_ONLY. Otherwise undue warnings would be issued for the
      policy CMP0022.
      
      The LINK_ONLY expression only has an effect for actual target
      names anyway, so there is no logical deficit.
      239b0c6b
  17. Oct 23, 2013
  18. Oct 18, 2013
    • Brad King's avatar
      MSVC: Add /FS flag for cl >= 18 to allow parallel compilation (#14492) · 216afc8a
      Brad King authored
      In generators such as Ninja that can run multiple "cl" processes that
      refer to the same compiler .pdb file (/Fd) at the same time, MSVC from
      Visual Studio 2013 complains:
      
       fatal error C1041: cannot open program database '.../vc120.pdb';
       if multiple CL.EXE write to the same .PDB file, please use /FS
      
      According to "cl /?":
      
       /FS force to use MSPDBSRV.EXE
      
      Add the flag to compilation lines for this compiler version just after the
      /Fd option.
      216afc8a
  19. Oct 11, 2013
Loading