Skip to content
Snippets Groups Projects
  1. Feb 14, 2014
  2. Feb 07, 2014
  3. Feb 04, 2014
  4. Jan 31, 2014
  5. Jan 29, 2014
  6. Jan 28, 2014
  7. Jan 27, 2014
    • Markus Blatt's avatar
      [cmake,release] Prevent searching twice for modules. · b58b8475
      Markus Blatt authored
      Before we tried to search for dune-common twice (once without a version
      and then with the required version). Unfortunately this breaks because
      we are adding the same library target twice. With this patch we only
      search for a module once.
      b58b8475
    • Markus Blatt's avatar
      [cmake,release] Test version with cmake and fix requiredness. · 2d20c167
      Markus Blatt authored
      Before this patch we always relied on dunecontrol/pkg-config to check
      for the correct version. With this patch we include this functionality
      also when building packges with dunecontrol for this use part of the version
      checking of cmake (or pkg-config if there are packages without CMake support).
      Basically we let CMake check wether the major and minor version matches and
      afterwards use the information from the dune.module file. This should make
      it possible to have several versions of DUNE installed and still always use
      the correct version. During fixing these issues we noticed that our version
      files were not recognized because the carried the wrong name. Now we use the
      correct name <dune-module>-config-version.cmake.
      2d20c167
  8. Jan 23, 2014
  9. Jan 22, 2014
    • Markus Blatt's avatar
      [bugfix,cmake] Process dependency tree including the module itself. · 58d2e446
      Markus Blatt authored
      One of the latest patches prevent the macros of the current module
      form being executed. This patch fixes this by including the module
      in the dependency tree.
      58d2e446
    • Markus Blatt's avatar
      [cmake,bugfix] Also include modules without macros in ALL_DEPENDENCIES. · 35d07e22
      Markus Blatt authored
      When making the entries of ALL_DEPENDENCIES unique, we skipped modules that
      did not ship a Dune<ModuleName>Macros.cmake macro. This caused their libraries
      to be missing in DUNE_LIBS. This patch fixes this situation.
      35d07e22
    • Markus Blatt's avatar
      [bugfix,cmake] Always read dune.module after finding a module to extract dependencies. · 938523a4
      Markus Blatt authored
      Previously we already processed dune.module but in a much later stage during
      configure. Dependencies are contained in dune.module. Therefore there is no
      need to replicate them in the CMake package configuration files. With this
      patch we now always process dune.module directly after finding the DUNE module.
      In addition we set ${DUNE_MOD_NAME}_(DEPENDS|SUGGESTS} in the CMake environment.
      As with this change DUNE_MOD_NAME will usually be set to to dune-common, we
      also changed to using ProjectName and ProjectVersion (the canonical CMake names)
      to refer to the current module and version.
      938523a4
  10. Jan 21, 2014
  11. Jan 16, 2014
    • Markus Blatt's avatar
      [cmake,bugfix] Allow 0 as a version. · 9afabdcd
      Markus Blatt authored
      Previously we checked whether the extracted Version evaluated to
      True. Unfortunately, there lazy people like me that like use a version
      of 0 for testing, which evaluates to False and breaks configure.
      With this patch we allow 0 to and just test wether the version consists
      of characters.
      9afabdcd
    • Markus Blatt's avatar
      [cmake,bugfix] Handle case where module search path is not in list. · d1011bfe
      Markus Blatt authored
      With new modules there were cases where cmake/modules was not in the
      modules path which made configuration fail. This patch fixes this case.
      d1011bfe
  12. Jan 13, 2014
  13. Jan 09, 2014
  14. Jan 08, 2014
    • Markus Blatt's avatar
      [bugfix,dunecontrol] Fixes sed statements to capture sequences variables. · 6b110c88
      Markus Blatt authored
      Some ^[$BLANK] or [^[$BLANK]^'], where $BLANK is space followed by tab
      did not work as a capturing statement in some cases (e.g. opts files
      with CONFIGURE_FLAGS="CXX='bla'"). After this patch we use [$NOBLANK]
      with NOBLANK=^$space^$tab which works. In addition the other patches
      form feature/posix-sed-dunecontrol have been backported to close flyspray
      1401.
      6b110c88
  15. Jan 07, 2014
    • Markus Blatt's avatar
      [autoconf,bugfix] Fixed typo in name of CMake macro. · 90ebe897
      Markus Blatt authored
      DuneCmakePackageConfigHelpers.cmake -> DuneCMakePackageConfigHelpers.cmake
      90ebe897
    • Markus Blatt's avatar
      [cmake,release] Provide a substitute for CMakePackageConfigHelpers. · 4c624058
      Markus Blatt authored
      Apparently it is not available with some older versions of CMake.
      Therefore we provide a poor man's alternative for it, if it is
      not there.
      4c624058
    • Markus Blatt's avatar
      [cmake,release] Correctly treat multiarch triplets in Debian. · cbdd8182
      Markus Blatt authored
      Debian uses multiarch-triplets (e.g. i386-gnu-linux) when installing
      object libraries. These are installed to lib/$multiarch-triplet and not
      to lib directly. In CMake this concept is partially supported by
      GNUInstallDirs.cmake by setting CMAKE_INSTALL_LIBDIR to
      lib/$multiarch-triplet. Unfortunately, this is only half the way through
      as we also install libraries that do not differ between architectures (e.g.
      our shell libraries.
      
      This patch addes multiarch support for CMake to the best of my knowledge,
      which might be limited, though:
      
      - All not architecture dependent libraries are installed below the variable
        DUNE_INSTALL_NONOBJECTLIBDIR, which defaults to lib, but might be adjusted
        by the user.
      - If the module ships an object library then the pkg-config and CMake package
        configuration files are installed in lib/$multiarch-triplet/pkg-config and
        lib/$multiarch-triplet/cmake/modules, respectively.
      - If not then they are installed in lib/pkg-config and
        lib/cmake/modules, respectively.
      
      Note that for autotool no such difference exists and always the latter approach
      is used.
      cbdd8182
    • Markus Blatt's avatar
      [cmake,autotools,release] Complete the last 2 patches concerning macro installation path. · 2e987422
      Markus Blatt authored
      Somehow I missed some files when committing. this patch fixes this.
      2e987422
    • Markus Blatt's avatar
      [cmake,release] Install cmake macros to $(datadir)/dune/cmake/ · 5dd5e160
      Markus Blatt authored
      Previously, the macros were installed to $(datadir)/cmake/. As we have
      some macros in DUNE that might also be in other packages
      this may cause conflicts in package managers. With this patch we install
      them to $(datadir)/dune/cmake to resolve this issue. Together with the
      last patch this will resolve problems  outlined in flyspray
      task 813
      https://dune-project.org/flyspray/index.php?do=details&task_id=813
      I apologize for givin the wrong task number in the previous patch.
      5dd5e160
  16. Jan 06, 2014
  17. Jan 03, 2014
  18. Jan 02, 2014
    • Markus Blatt's avatar
      [cmake,bugfix] Fixes requiredness of module · 86f1dc9c
      Markus Blatt authored
      Previously, dependencies were not correctly searched for as
      required packages. This patch fixes this.
      86f1dc9c
    • Markus Blatt's avatar
      [bugfix,cmake] Fixes precendence issues in module path · d7a1f326
      Markus Blatt authored
      When working with installed modules, the cmake scripts and
      modules of the current module should take precendence over
      any installed ones. This was not the case before this patch.
      
      Furthermore, modules downstream in the
      dependency tree should be able to overwrite tests in  modules
      that they depend on. This patch more caredfully crafts the
      CMAKE_MODULE_PATH to reflect the module dependency in it.
      d7a1f326
  19. Dec 28, 2013
  20. Dec 20, 2013
    • Steffen Müthing's avatar
      [bugfix] Fixes GMP test. · 79cc2c42
      Steffen Müthing authored and Markus Blatt's avatar Markus Blatt committed
      Previoulsy CMake always fails to find the __gmpz_abs symbol on my machine, even though it is clearly there.
      The test used check_symbol_exists. According to the documentation, check_symbol_exists tries to include the
      second argument into a test program to check whether there is a prototype for the first argument, so as the
      second argument is a binary, that can't really work... This patch switches over to use check_library_exists.
      79cc2c42
    • Markus Blatt's avatar
      [cmake,release] Corrects setting of HAVE_* variables. · e258dbd6
      Markus Blatt authored
      For generating the config.h file we use the HAVE_* variables instead
      of the CMake ones *_FOUND, Unfortunately, we sometines to not set
      HAVE_* to the value of the *_FOUND vriable but to its name. Usually
      we only query whether these variable are set at all. While
      this often (except for psurface) does not pose a problem, it is semantically
      wrong. Therfore this patch fixes this.
      
      Kudos to Ansgar for pointing to this problem.
      e258dbd6
  21. Dec 18, 2013
Loading