1. 04 Jun, 2014 1 commit
  2. 15 May, 2014 2 commits
    • Brad King's avatar
      Xcode: Add source file property to control file type (#14854) · a339ea65
      Brad King authored
      Add source file properties to control Xcode file type attributes:
      
        XCODE_EXPLICIT_FILE_TYPE   => explicitFileType
        XCODE_LAST_KNOWN_FILE_TYPE => lastKnownFileType
      
      Add a RunCMake.XcodeProject test to verify generated project content.
      a339ea65
    • Brad King's avatar
      Xcode: Refactor internal source file type selection · ae80cb9f
      Brad King authored
      Choose the attribute name and file type and send them through a single
      attribute generation code path.  Compute the file extension only when
      needed.  Leave the file type selection logic indented in a block so it
      can be made conditional later.
      ae80cb9f
  3. 07 May, 2014 1 commit
  4. 02 Apr, 2014 3 commits
    • Stephen Kelly's avatar
      cmTarget: Make the source files depend on the config. · e6971df6
      Stephen Kelly authored
      Disallow the use of config-specific source files with
      the Visual Studio and Xcode generators. They don't have
      any way to represent the condition currently.
      
      Use the same common-config API in cmQtAutoGenerators. While
      it accepts config-specific files, it doesn't have to support
      multiple configurations yet.
      
      Loop over the configs in cmTargetTraceDependencies
      and cmGlobalGenerator::WriteSummary and consume all source
      files.
      
      Loop over the configs in cmComputeTargetDepends and compute the
      object library dependencies for each config.
      e6971df6
    • Stephen Kelly's avatar
      cmGeneratorTarget: Compute target objects on demand · aa0a3562
      Stephen Kelly authored
      Add a ComputeObjectMapping method to compute the object
      names.  It takes mapping to populate as an out-parameter so
      that it can be extended in the future with parameters
      relevant to generator expression evaluation.
      
      Remove the supporting cmGeneratorTarget::AddObject method. It is
      no longer needed as the container member is populated directly.
      
      The ComputeObjectMapping method is called whenever objects are
      requested from the cmGeneratorTarget.  Because the Xcode generator
      makes no such request, explicitly invoke the method from that
      generator so that the logic of checking for bad sources in object
      libraries is executed.
      
      In a follow-up, the UseObjectLibraries usage may be replaced by a
      true generator expression evaluator for TARGET_OBJECTS. That
      will require generators to use cmGeneratorTarget::GetExternalObjects
      which is not currently the case for Xcode and VS generators.
      aa0a3562
    • Stephen Kelly's avatar
      cmTarget: Allow any generator expression in SOURCES property. · e5da9e51
      Stephen Kelly authored
      Remove use of UseObjectLibraries from Makefile and Ninja generators. It
      is not needed now because those generators use GetExternalObjects
      which already contains the objects from object libraries.
      
      The VS10 generator calls both the UseObjectLibraries and the GetExternalObjects
      methods. Ensure that duplicates are not created by skipping objects
      from object libraries in handling of GetExternalObjects.
      
      Similarly, fix VS6, VS7 and Xcode object handling by skipping
      external objects from OBJECT_LIBRARY usage as appropriate.
      
      The error message in the BadSourceExpression1 test is now reported
      by the generator expression evaluator, so it has different text.
      e5da9e51
  5. 31 Mar, 2014 3 commits
  6. 15 Mar, 2014 1 commit
  7. 13 Mar, 2014 3 commits
  8. 12 Mar, 2014 3 commits
  9. 08 Mar, 2014 10 commits
  10. 24 Feb, 2014 1 commit
  11. 03 Feb, 2014 1 commit
    • Clinton Stimpson's avatar
      OS X: Make sure RPATHs are unique to avoid possible corruption. · 028a5285
      Clinton Stimpson authored
      When using link_directories() and including CMAKE_CFG_INTDIR,
      one can end up with duplicate RPATHs in the binary which
      install_name_tool cannot fix without corrupting the binary.
      Also, the cmake_install.cmake file has been fixed to correctly
      handle these generator specific variables.
      028a5285
  12. 22 Jan, 2014 1 commit
  13. 16 Jan, 2014 2 commits
    • Ruslan Baratov's avatar
      Xcode: Fix storyboard view · 1ce02ebf
      Ruslan Baratov authored and Brad King's avatar Brad King committed
      Images and xib files must have 'lastKnownFileType' attribute to be
      displayed correctly. If xib file has attribute 'explicitFileType' it is
      displayed as raw xml. If static image has attribute 'explicitFileType'
      it is displayed as question mark on storyboard.
      1ce02ebf
    • Ruslan Baratov's avatar
      Xcode: Remove dead code · d9f1f917
      Ruslan Baratov authored and Brad King's avatar Brad King committed
      Variable 'ext' already checked for equality to "xib" so remove the
      branch that will never be executed.
      d9f1f917
  14. 09 Jan, 2014 2 commits
  15. 07 Jan, 2014 2 commits
    • 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
    • Ruslan Baratov's avatar
      Xcode: Fix storyboard view · 2d23c1f1
      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'.
      2d23c1f1
  16. 06 Jan, 2014 1 commit
  17. 11 Dec, 2013 1 commit
  18. 02 Dec, 2013 1 commit
  19. 18 Nov, 2013 1 commit
    • Brad King's avatar
      Teach GenerateBuildCommand to find its own make program · 123a0608
      Brad King authored
      Add a cmGlobalGenerator::SelectMakeProgram method to select a
      caller-provided make program, the CMAKE_MAKE_PROGRAM cache entry, or a
      generator-provided default.  Call it from all implementations of the
      GenerateBuildCommand method with the corresponding generator's default,
      if any.
      123a0608