1. 27 Mar, 2012 2 commits
    • Ben Boeckel's avatar
      Search for other ABIFLAGS builds of Python · 4bdec581
      Ben Boeckel authored
      Starting with Python3, standard Python installs may have additional ABI
      flags attached to include directories and library names. As of 3.2, the
      following flags are in the configure file:
      
          d -> --with-debug
          m -> --with-pymalloc
          u -> --with-wide-unicode
      
      Python 3.3 seems to no longer have --with-wide-unicode. Hopefully Python
      will ensure that the possible flags always show up in a stable order.
      The 'd' flag is ignored since the debug library is considered separate.
      
      There is still the problem where ABI flags cannot be specified in
      find_package since the letters confuse the version comparator.
      4bdec581
    • Ben Boeckel's avatar
      Don't put legacy variables back into the cache · 6a46f5ce
      Ben Boeckel authored
      If PYTHON_INCLUDE_PATH is put into the cache, then it will always
      override whatever might be found and PYTHON_INCLUDE_DIR is never given a
      chance to find something different. It being marked as INTERNAL also
      means that it cannot be changed without editing CMakeCache.txt directly.
      
      Basically, the scenario is that if the Python version is changed, then
      deleting PYTHON_INCLUDE_DIR doesn't work because any cached
      PYTHON_INCLUDE_PATH variable is set before find_path is even called. Any
      build tree using a previous version will still need either manual
      removal of PYTHON_INCLUDE_PATH or a complete reconfigure, but in the
      future changing the Python version can be accomplished by deleting
      PYTHON_INCLUDE_DIR and reconfiguring with the new version.
      6a46f5ce
  2. 26 Mar, 2012 1 commit
  3. 25 Mar, 2012 1 commit
  4. 24 Mar, 2012 1 commit
  5. 23 Mar, 2012 2 commits
  6. 22 Mar, 2012 2 commits
  7. 21 Mar, 2012 9 commits
  8. 20 Mar, 2012 12 commits
    • Alexander Neundorf's avatar
      1ab4b3e1
    • Alexander Neundorf's avatar
      Eclipse: fix #13036, make version detection work with symlinks · 00af40b2
      Alexander Neundorf authored
      This patch uses get_filename_component(REALPATH) so symlinks in the path
      to Eclipse are resolved, which makes the version detection work in such cases.
      
      Alex
      00af40b2
    • David Cole's avatar
      Tests: Relax restrictions on version variable contents · a5ee6285
      David Cole authored
      Our only expectation of version number variables should be that
      they begin with a decimal digit for VERSION_LESS, VERSION_EQUAL
      and VERSION_GREATER comparison purposes. If people put extra
      blah blah after a version number like "1.2.3 (this is some super
      special extra information about our funky proprietary build of
      the official 1.2.3 release)" then we should be ok with that.
      
      So: now we have the following expectations for version number
      variable content for the purposes of the AllFindModules test:
      
       - it should start with a decimal digit (match "^[0-9]")
       - it should not be empty
       - it should not be VERSION_EQUAL 0
       - it should not be NOT VERSION_GREATER 0
      a5ee6285
    • Brad King's avatar
      86c4c938
    • Brad King's avatar
      KWIML: Avoid conflict with C++11 user-defined literals · 10272e64
      Brad King authored
      Clang warns
      
       test/test_INT_format.h:28:26: warning: identifier after literal will
       be treated as a reserved user-defined literal suffix in C++11
       [-Wc++11-compat-reserved-user-defined-literal]
        " expression [%"KWIML_INT_PRI##PRI"],"
      
      because the KWIML_... part is an identifier lexically immediately
      following a string literal.  Add a space between the string literal
      and the identifier to avoid the C++11 user-defined literal syntax.
      10272e64
    • Bill Hoffman's avatar
      Fix FindMPI for the intel compiler on linux by looking in implict directories. · 2f9ad7c6
      Bill Hoffman authored
      Use the CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES to look for libraries
      that are in the -showme output from mpi<lang> programs. This is because
      some libraries reported by -showme are found there, and FindMPI will
      fail if they are not found.
      2f9ad7c6
    • Brad King's avatar
      Fix ObjectLibrary test on Watcom · fb7348f6
      Brad King authored
      The Watcom compiler interprets "-DB" as option
      
       -db generate browsing information
      
      so define "A_DEF" and "B_DEF" instead of just "A" and "B".
      
      Skip CMAKE_SHARED_LIBRARY_C_FLAGS for Watcom because it is set to
      
       -bd  build Dynamic link library
      
      which adds a DLL entry point to each object.
      fb7348f6
    • David Cole's avatar
      Merge topic 'ninja-generator' · d69c2c58
      David Cole authored
      c337c7e2 Ninja: Fix <OBJECT_DIR> substitution
      d69c2c58
    • David Cole's avatar
      Merge topic 'object-library' · 31c0bc02
      David Cole authored
      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
      ...
      31c0bc02
    • David Cole's avatar
      Merge topic 'fix-docs-typos' · b06f7c07
      David Cole authored
      5b8983ee Fix some typos in the docs comments.
      b06f7c07
    • Brad King's avatar
      VS10: Fix external objects generated outside target (#13047) · b291d9e7
      Brad King authored
      Commit 9a6ff950 (Fix for bug where VS2010 did not use .obj files,
      2011-04-01) assumed that if an external object is GENERATED that it is
      the output of a custom command in the current target.  If it is
      generated by another target then VS will not automatically include the
      external object in the current target.  This bug was preserved by the
      refactoring in the parent commit.
      
      Instead use <None> for external objects generated by a custom command in
      the current target and <Object> for all other external objects.  Update
      the ExternalOBJ test to cover this case.
      b291d9e7
    • Kitware Robot's avatar
      KWSys Nightly Date Stamp · f7533740
      Kitware Robot authored
      f7533740
  9. 19 Mar, 2012 10 commits