Skip to content
Snippets Groups Projects
  1. Feb 19, 2013
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6676 · 28011781
      Markus Blatt authored
      Revision  r6676
      .----------------------
      trick cmake to use the current source path when compiling and not the
      one when this directive is processed.
      
      .----------------------
      
      
      [[Imported from SVN: r7203]]
      28011781
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6675 · 78df569e
      Markus Blatt authored
      Revision  r6675
      .----------------------
      Fix indentation.
      
      .----------------------
      
      
      [[Imported from SVN: r7202]]
      78df569e
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6674 · 47bf7450
      Markus Blatt authored
      Revision  r6674
      .----------------------
      Moved install directive for iteratortest.hh to parent directory as the
      test directory is excluded from all and apparently not considered
      during make install
      
      .----------------------
      
      
      [[Imported from SVN: r7201]]
      47bf7450
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6673 · dbea60d0
      Markus Blatt authored
      Revision  r6673
      .----------------------
      No need to install Doxystyle.
      
      .----------------------
      
      
      [[Imported from SVN: r7200]]
      dbea60d0
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6672 · 314d9144
      Markus Blatt authored
      Revision  r6672
      .----------------------
      Use SCRIPT_DIR as locaton of the scripts.
      
      .----------------------
      
      
      [[Imported from SVN: r7199]]
      314d9144
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6671 · 3df0b630
      Markus Blatt authored
      Revision  r6671
      .----------------------
      Search for doxygen cmake scripts in installed dune-common.
      
      .----------------------
      
      
      [[Imported from SVN: r7198]]
      3df0b630
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6670 · 3670aec1
      Markus Blatt authored
      Revision  r6670
      .----------------------
      Another bracket was missing.
      
      .----------------------
      
      
      [[Imported from SVN: r7197]]
      3670aec1
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6669 · f9021be2
      Markus Blatt authored
      Revision  r6669
      .----------------------
      Provide exported libraries.
      Added function to link to default libraries.
      
      .----------------------
      
      
      [[Imported from SVN: r7196]]
      f9021be2
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6668 · bcb11c19
      Markus Blatt authored
      Revision  r6668
      .----------------------
      Bugfix: closing curly bracket was missing.
      
      .----------------------
      
      
      [[Imported from SVN: r7195]]
      bcb11c19
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6667 · 741f3762
      Markus Blatt authored
      Revision  r6667
      .----------------------
      Allow specification of multiple targets.
      
      .----------------------
      
      
      [[Imported from SVN: r7194]]
      741f3762
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6665 · 1527d404
      Markus Blatt authored
      Revision  r6665
      .----------------------
      Use uppercase module name.
      
      .----------------------
      
      
      [[Imported from SVN: r7193]]
      1527d404
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6664 · 1ec87ec4
      Markus Blatt authored
      Revision  r6664
      .----------------------
      Somehow I messed up the config.h.cmake generation. Works again now.
      
      .----------------------
      
      
      [[Imported from SVN: r7192]]
      1ec87ec4
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6663 · 53267c1f
      Markus Blatt authored
      Revision  r6663
      .----------------------
      Fixes the boost issue Bernd discovered.
      
      .----------------------
      
      
      [[Imported from SVN: r7191]]
      53267c1f
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6662 · 42fce34e
      Markus Blatt authored
      Revision  r6662
      .----------------------
      Adhere to naming convention of macro files, macro and function names.
      
      .----------------------
      
      
      [[Imported from SVN: r7190]]
      42fce34e
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6661 · 08196978
      Markus Blatt authored
      Revision  r6661
      .----------------------
      Completed adaptation of duneproject. It now creates a complete
      infrastructure to use the module with cmake.
      
      Currently, only an installed dune-common can be used, as the others
      lack the cmake confguration files. One has to provide the
      CMAKE_MODULE_PATH pointing to the directory where
      e.g. DuneMacros.cmake is installed (PREFIX/share/cmake/modules) and 
      DuneCommon_DIR pointing to PREFIXlib/cmake.
      
      The ${CMAKE_BINARY_DIR}/config.h.cmake of the project is created such
      that it includes section from modules that it depends on as well as
      the ${CMAKE_SOURCE_DIR}/config.h.cmake. This prevents user from
      creating a full file by hand.
      
      Renamed package configuration files according to the style of the 
      other modules.
      
      .----------------------
      
      
      [[Imported from SVN: r7189]]
      08196978
    • 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
Loading