Skip to content
Snippets Groups Projects
  1. Feb 19, 2013
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6660 · 37948eb4
      Markus Blatt authored
      Revision  r6660
      .----------------------
      Hide complexity from toplevel CMakeLists.txt.
      
      .----------------------
      
      
      [[Imported from SVN: r7188]]
      37948eb4
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6655 · bc69efe8
      Markus Blatt authored
      Revision  r6655
      .----------------------
      Make toplevel CMakeLists.txt more modular to facilitate usage in
      other DUNE modules.
      
      Check the dune.module file more rigorously! (Previously errors were
      not apparent)
      
      .----------------------
      
      
      [[Imported from SVN: r7187]]
      bc69efe8
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r6654 · 57cd111e
      Markus Blatt authored
      Initial message was : Merge sync to keep track with the trunk.
      
      Thanks for renaming files and targets. Always a pleasure to mimic this manually.
      
      
      [[Imported from SVN: r7186]]
      57cd111e
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6653 · beb43a31
      Markus Blatt authored
      Revision  r6653
      .----------------------
      Export CXX flags.
      
      .----------------------
      
      
      [[Imported from SVN: r7185]]
      beb43a31
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6652 · 548d52cb
      Markus Blatt authored
      Revision  r6652
      .----------------------
      Install cmake modules and scripts.
      
      .----------------------
      
      
      [[Imported from SVN: r7184]]
      548d52cb
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6651 · d317a5f6
      Markus Blatt authored
      Revision  r6651
      .----------------------
      Do not use set_definitions for the C++11 standard flags, but put them
      directly into the various CXX_FLAGS.
      This prevents warnings.
      
      .----------------------
      
      
      [[Imported from SVN: r7183]]
      d317a5f6
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6650 · 61888a20
      Markus Blatt authored
      Revision  r6650
      .----------------------
      Update  install_manifest.txt to include files installed during
      subprocess cmak call.
      
      .----------------------
      
      
      [[Imported from SVN: r7182]]
      61888a20
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6644 · 00271812
      Markus Blatt authored
      Revision  r6644
      .----------------------
      Make library dunecommon link to lapack directly. Now lapack does not
      have to specified during linking because it is implied by dunecommon.
      
      .----------------------
      
      
      [[Imported from SVN: r7181]]
      00271812
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6643 · 89879b51
      Markus Blatt authored
      Revision  r6643
      .----------------------
      Added preliminary package configuration files.
      
      .----------------------
      
      
      [[Imported from SVN: r7180]]
      89879b51
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6642 · 4614275e
      Markus Blatt authored
      Revision  r6642
      .----------------------
      Checkin the tuple and typetraits changes. (Forgotten this one)
      
      .----------------------
      
      
      [[Imported from SVN: r7179]]
      4614275e
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6641 · 518320d2
      Markus Blatt authored
      Revision  r6641
      .----------------------
      Install libs correctly.
      Produce and install a preliminary  package configuration file.
      
      .----------------------
      
      
      [[Imported from SVN: r7178]]
      518320d2
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6640 · ee6aa053
      Markus Blatt authored
      Revision  r6640
      .----------------------
      test for tuple and type_traits headers.
      
      .----------------------
      
      
      [[Imported from SVN: r7177]]
      ee6aa053
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6639 · 58178f1f
      Markus Blatt authored
      Revision  r6639
      .----------------------
      enable_language(<language> OPTIONAL) does not work due to bug
      http://public.kitware.com/Bug/view.php?id=9220 .
      Used the provided workaround to make fortran optional.
      
      Please note:
      No Fortran == No Lapack or Blas
      
      .----------------------
      
      
      [[Imported from SVN: r7176]]
      58178f1f
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6638 · 4af99c25
      Markus Blatt authored
      Revision  r6638
      .----------------------
      Be more compatible with the trunk.
      
      .----------------------
      
      
      [[Imported from SVN: r7175]]
      4af99c25
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6637 · 5f2c23bb
      Markus Blatt authored
      Revision  r6637
      .----------------------
      cmakedefine01 <VAR> --> cmakedefine <VAR> value
      the latter results in no define if value VAR is False.
      
      .----------------------
      
      
      [[Imported from SVN: r7174]]
      5f2c23bb
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6636 · 1a9824a3
      Markus Blatt authored
      Revision  r6636
      .----------------------
      Reordered defines for better comparison with trunk.
      
      .----------------------
      
      
      [[Imported from SVN: r7173]]
      1a9824a3
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6635 · 972ea186
      Markus Blatt authored
      Revision  r6635
      .----------------------
      Introduced HAVE_BLAS
      
      .----------------------
      
      
      [[Imported from SVN: r7172]]
      972ea186
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6634 · c9adb852
      Markus Blatt authored
      Revision  r6634
      .----------------------
      Pipe output of doxygen into doxygen.log and install it.
      
      .----------------------
      
      
      [[Imported from SVN: r7171]]
      c9adb852
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6633 · 5e00b89b
      Markus Blatt authored
      Revision  r6633
      .----------------------
      Only install necessary doxygen files and install the directly into
      share/doc/dune-common/doxygen.
      InstallFile.cmake now supports a list of files.
      
      .----------------------
      
      
      [[Imported from SVN: r7170]]
      5e00b89b
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6627 · 9e2045e4
      Markus Blatt authored
      Revision  r6627
      .----------------------
      Set debug and relase compiler flags.
      
      .----------------------
      
      
      [[Imported from SVN: r7169]]
      9e2045e4
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6626 · 73ae35d0
      Markus Blatt authored
      Revision  r6626
      .----------------------
      - Make doc installation script more flexible such that other
       documentation besides doxygen can be installed.
      - Make sure we install under ${CMAKE_INSTALL_PREFIX}. Therefore
        we must provide the absolute path to our custom install script.
      - Include DuneDoc at toplevel and let create the doc target. Thus
        we can use its macros all over the place.
      
      .----------------------
      
      
      [[Imported from SVN: r7168]]
      73ae35d0
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6625 · 59a3d6c2
      Markus Blatt authored
      Revision  r6625
      .----------------------
      Remove redundant target and add more documentation.
      
      .----------------------
      
      
      [[Imported from SVN: r7167]]
      59a3d6c2
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6624 · dd84e4d1
      Markus Blatt authored
      Revision  r6624
      .----------------------
      Finally installing the doxygen documentation works.
      Removed UseDoxygen.cmake as it does not seem to fit our needs.
      
      BTW: Welcome to the CMake hell! It exists, I have experienced it!
      
      .----------------------
      
      
      [[Imported from SVN: r7166]]
      dd84e4d1
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6623 · f400694e
      Markus Blatt authored
      Revision  r6623
      .----------------------
      Rudimentarily build the doxygen documentation.
      
      .----------------------
      
      
      [[Imported from SVN: r7165]]
      f400694e
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6622 · 27b63385
      Markus Blatt authored
      Revision  r6622
      .----------------------
      Started our own doxygen CMake rules. We cannot use UseDoxygen.cmake as
      Doyfile.in needs to be generated.
      
      .----------------------
      
      
      [[Imported from SVN: r7164]]
      27b63385
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6621 · 42397b22
      Markus Blatt authored
      Revision  r6621
      .----------------------
      Removed superfluous curly bracket.
      
      .----------------------
      
      
      [[Imported from SVN: r7163]]
      42397b22
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6620 · 2781b4a3
      Markus Blatt authored
      Revision  r6620
      .----------------------
      Create a rudimentary Doxyfile using cmake.
      
      .----------------------
      
      
      [[Imported from SVN: r7162]]
      2781b4a3
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6619 · 869634d3
      Markus Blatt authored
      Revision  r6619
      .----------------------
      Introduced doc target for building the documentation.
      Right now only the buildsystem documentation is built.
      
      .----------------------
      
      
      [[Imported from SVN: r7161]]
      869634d3
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6618 · d5c6ccda
      Markus Blatt authored
      Revision  r6618
      .----------------------
      Facilitate providing a custom target name where the files will be
      creates. Thus we can run latex during make doc.
      
      .----------------------
      
      
      [[Imported from SVN: r7160]]
      d5c6ccda
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6615 · ccfbcdd1
      Markus Blatt authored
      Revision  r6615
      .----------------------
      Make this more compact and readable by using loops.
      
      .----------------------
      
      
      [[Imported from SVN: r7159]]
      ccfbcdd1
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6614 · fdcb4c98
      Markus Blatt authored
      Revision  r6614
      .----------------------
      Use MPI in the DUNE way (deactivating the CXX bindings using
      the ENABLE trick).
      Added an utility cmake function to add the necessary flags for
      compilation and linking.
      
      .----------------------
      
      
      [[Imported from SVN: r7158]]
      fdcb4c98
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6613 · 982348d2
      Markus Blatt authored
      Revision  r6613
      .----------------------
      Added missing file with the doxygen stuff.
      
      .----------------------
      
      
      [[Imported from SVN: r7157]]
      982348d2
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6612 · c6a310ea
      Markus Blatt authored
      Revision  r6612
      .----------------------
      The names of the produced executable were changed in the branch :/
      Now the executables with the correct names are built.
      
      .----------------------
      
      
      [[Imported from SVN: r7156]]
      c6a310ea
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6611 · 4e9b6b43
      Markus Blatt authored
      Revision  r6611
      .----------------------
      Moved add_test directives to CMakeLists.txt of the right directory.
      
      .----------------------
      
      
      [[Imported from SVN: r7155]]
      4e9b6b43
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6610 · 4225a5cb
      Markus Blatt authored
      Revision  r6610
      .----------------------
      - Moved the test definitions to the CMakeLists.txt of the test
        directories. This seems to be more manageable.
      - Deactivated building of the test during make all. Seems annoying to
        our users.
      - Introduced make check mimicing autotools.
      
      Tests still fail where they should not.
      
      .----------------------
      
      
      [[Imported from SVN: r7154]]
      4225a5cb
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6609 · 490d6d6c
      Markus Blatt authored
      Revision  r6609
      .----------------------
      Enable testing _BEFORE_ adding sub directories.
      
      .----------------------
      
      
      [[Imported from SVN: r7153]]
      490d6d6c
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6606 · 0d1ae455
      Markus Blatt authored
      Revision  r6606
      .----------------------
      Adapt cmake variables, such that we can use dune-common.pc.in
      .----------------------
      
      
      [[Imported from SVN: r7152]]
      0d1ae455
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6605 · bcbafb97
      Markus Blatt authored
      Revision  r6605
      .----------------------
      Install Doxystyle file.
      
      .----------------------
      
      
      [[Imported from SVN: r7151]]
      bcbafb97
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6604 · 4340ffe6
      Markus Blatt authored
      Revision  r6604
      .----------------------
      Install buildsystem.pdf
      
      .----------------------
      
      
      [[Imported from SVN: r7150]]
      4340ffe6
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6603 · a30b43b3
      Markus Blatt authored
      Revision  r6603
      .----------------------
      Build the build system documentation.
      
      ISSUES:
      - Only works for out of source builds
      - We will probably run into issues on non-unix platforms
      - Is the licence compatible with ours?
      
      .----------------------
      
      
      [[Imported from SVN: r7149]]
      a30b43b3
Loading