Skip to content
Snippets Groups Projects
  1. Feb 19, 2013
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7130 · 4fb26edd
      Markus Blatt authored
      Revision  r7130
      .----------------------
      Added define for HAVE_<MODULE_NAME>.
      
      .----------------------
      
      
      [[Imported from SVN: r7356]]
      4fb26edd
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r7129 · 734e41f1
      Markus Blatt authored
      Initial message was : Merged recent changes from the trunk and add test for cxa_demangle to CMake build system.
      
      [[Imported from SVN: r7355]]
      734e41f1
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7128 · 6b8f61be
      Markus Blatt authored
      Revision  r7128
      .----------------------
      distribute files needed by cmake with autotools-generated tarballs
      .----------------------
      
      
      [[Imported from SVN: r7354]]
      6b8f61be
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7126 · c90d12c1
      Markus Blatt authored
      Revision  r7126
      .----------------------
      added missing whitespace after CMakeLists.txt
      .----------------------
      
      
      [[Imported from SVN: r7353]]
      c90d12c1
    • Markus Blatt's avatar
      [Merge][CMake] Manually merged (conflicting) revisions : 7124 · be3fd526
      Markus Blatt authored
      Revision  r7124
      .----------------------
      distribute CMakeLists.txt with autotools tarballs
      
      [[Imported from SVN: r7352]]
      be3fd526
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r7123 · 64f155f4
      Markus Blatt authored
      Initial message was : Merged latest changes from trunk
      
      [[Imported from SVN: r7351]]
      64f155f4
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7121 · ef2e6db7
      Markus Blatt authored
      Revision  r7121
      .----------------------
      
      Create makefiles below cmake directory.
      
      .----------------------
      
      
      [[Imported from SVN: r7350]]
      ef2e6db7
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7120 · 82ebd64b
      Markus Blatt authored
      Revision  r7120
      .----------------------
      
      Process makefiles below cmake directory.
      
      .----------------------
      
      
      [[Imported from SVN: r7349]]
      82ebd64b
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7119 · b9a8851b
      Markus Blatt authored
      Revision  r7119
      .----------------------
      
      Install CMake files with autotools.
      
      .----------------------
      
      
      [[Imported from SVN: r7348]]
      b9a8851b
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7118 · dbe15e5b
      Markus Blatt authored
      Revision  r7118
      .----------------------
      Replaced globbing expression with file list.
      
      .----------------------
      
      
      [[Imported from SVN: r7347]]
      dbe15e5b
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r7117 · 5567213c
      Markus Blatt authored
      Initial message was : Make autotools the default build system. 
      
      One can select CMake using the --use-cmake switch. This prepares
      the merge to the trunk.
      
      
      [[Imported from SVN: r7346]]
      5567213c
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r7116 · 043818fb
      Markus Blatt authored
      Initial message was : added missing CMakeLists.txt
      
      [[Imported from SVN: r7345]]
      043818fb
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r7115 · 368f98fd
      Markus Blatt authored
      Initial message was : [MERGE] merged recent changes from the trunk and adapted build system.
      
      [[Imported from SVN: r7344]]
      368f98fd
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7114 · 7048cc0d
      Markus Blatt authored
      Revision  r7114
      .----------------------
      Adapt to changes made to the autoconf/automake build system.
      Corrected a typo.
      
      .----------------------
      
      
      [[Imported from SVN: r7343]]
      7048cc0d
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r7073 · 4c8a09d4
      Markus Blatt authored
      Initial message was : Use LAPACK for eigenvaluestest only iff LAPACK was found.
      
      [[Imported from SVN: r7342]]
      4c8a09d4
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7071 · 18e66888
      Markus Blatt authored
      Revision  r7071
      .----------------------
      Mode macro name for adding gmp flags consistent
      .----------------------
      
      
      [[Imported from SVN: r7341]]
      18e66888
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r7070 · 944f1a6e
      Markus Blatt authored
      Initial message was : Merged changes from trunk and changed CMake build system accordingly.
      
      
      [[Imported from SVN: r7340]]
      944f1a6e
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7059 · efef97ac
      Markus Blatt authored
      Revision  r7059
      .----------------------
      [FindGMP.cmake]
      Complete overwork of GMP test.
      Changed variable GMP_PATH to GMP_PREFIX.
      
      Tested without GMP and with GMP 5.0.5, both installed in /usr and using a
      user-specified prefix path.
      
      .----------------------
      
      
      [[Imported from SVN: r7339]]
      efef97ac
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7054 · f6430a0c
      Markus Blatt authored
      Revision  r7054
      .----------------------
      [FindParMETIS.cmake]
      Improve ParMETIS test, tested with dune-istl and ParMETIS versions 3.2.0 and 4.0.2.
      
      
      .----------------------
      
      
      [[Imported from SVN: r7338]]
      f6430a0c
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r7050 · a11351a3
      Markus Blatt authored
      Initial message was : Merge last bugfix from trunk.
      
      Fixes bugs in conversion to bool with clang.
      
      
      [[Imported from SVN: r7337]]
      a11351a3
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r7048 · 9e97830d
      Markus Blatt authored
      Initial message was : Merged latest shared_ptr improvements from trunk
      
      [[Imported from SVN: r7336]]
      9e97830d
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7044 · affd6aae
      Markus Blatt authored
      Revision  r7044
      .----------------------
      Some of the macros used are only available for CMake 2.8.6 and higher. Bumped required CMake version
      .----------------------
      
      
      [[Imported from SVN: r7335]]
      affd6aae
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7035 · ebd96b31
      Markus Blatt authored
      Revision  r7035
      .----------------------
      [FindMETIS.cmake]
      Improve METIS test, tested with versions 4.0.3 and 5.0.2.
      
      .----------------------
      
      
      [[Imported from SVN: r7334]]
      ebd96b31
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7003 · 1096581b
      Markus Blatt authored
      Revision  r7003
      .----------------------
      At some places quotation marks trick CMake into misinterpreting a list
      of files as one file with semicolons in the name.
      
      .----------------------
      
      
      [[Imported from SVN: r7333]]
      1096581b
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7002 · 4fe56895
      Markus Blatt authored
      Revision  r7002
      .----------------------
      Updated the rest of the script.
      
      .----------------------
      
      
      [[Imported from SVN: r7332]]
      4fe56895
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7001 · 6a4ddb97
      Markus Blatt authored
      Revision  r7001
      .----------------------
      Adapt script to changes of the way to find the modules.
      
      .----------------------
      
      
      [[Imported from SVN: r7331]]
      6a4ddb97
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 7000 · efa591a6
      Markus Blatt authored
      Revision  r7000
      .----------------------
      Adjusted CMakeLists.txt according to added files.
      
      .----------------------
      
      
      [[Imported from SVN: r7330]]
      efa591a6
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r6999 · 16ee3b3b
      Markus Blatt authored
      Initial message was : Merged latest patches from the trunk
      
      [[Imported from SVN: r7329]]
      16ee3b3b
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6998 · a6648f11
      Markus Blatt authored
      Revision  r6998
      .----------------------
      Do not override ADD_LIBS or COMPILE_FLAGS during expansion.
      .----------------------
      
      
      [[Imported from SVN: r7328]]
      a6648f11
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6996 · a2100072
      Markus Blatt authored
      Revision  r6996
      .----------------------
      - List the cmake modules explicitly (file(GLOB will not detect changes
        after configure)
      - Make CMake module installation path configurable
      - Detect CMAKE_MODULE_PATH automatically
        + First call find_package(dune-common) to query its CMAKE_MODULE_PATH
        + Then setup the module path
        + After each find_package of dune module update the CMAK_MODULE_PATH
        + each module exports ist own <package-name>_MODULE_PATH in the
        + package configuration files
      - Adapted dunecontrol and duneproject accordingly.
      
      .----------------------
      
      
      [[Imported from SVN: r7327]]
      a2100072
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6994 · 1705ad4c
      Markus Blatt authored
      Revision  r6994
      .----------------------
      Process CXXFLAGS when looking for flag dependencies. Set BUILD_DOCS.
      .----------------------
      
      
      [[Imported from SVN: r7326]]
      1705ad4c
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r6993 · 5eac9aba
      Markus Blatt authored
      Initial message was : Merged changes from the trunk.
      Added new CMake test for integral_constant.
      
      
      [[Imported from SVN: r7325]]
      5eac9aba
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6991 · a60270e5
      Markus Blatt authored
      Revision  r6991
      .----------------------
      Use DATAROOTDIR instead of PREFIX/share
      
      .----------------------
      
      
      [[Imported from SVN: r7324]]
      a60270e5
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6990 · 69ae0f0a
      Markus Blatt authored
      Revision  r6990
      .----------------------
      Added missing line breaks.
      
      .----------------------
      
      
      [[Imported from SVN: r7323]]
      69ae0f0a
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6989 · 3465c28c
      Markus Blatt authored
      Revision  r6989
      .----------------------
      Allow colons in variable assignments.
      Allow text after endif.
      
      .----------------------
      
      
      [[Imported from SVN: r7322]]
      3465c28c
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6988 · 4a9231fa
      Markus Blatt authored
      Revision  r6988
      .----------------------
      Use GNUInstallDir to specify installation directory.
      
      .----------------------
      
      
      [[Imported from SVN: r7321]]
      4a9231fa
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6987 · 949b33a5
      Markus Blatt authored
      Revision  r6987
      .----------------------
      - Got rid off debugging output.
      - Removed dependency on cmake version 2.8.9
        Object libraries can now be created with dune_add_library(<target>
        OBJECT <sources>). It will create a GLOBAL property
        _DUNE_TARGET_OBJECTS:<target>_ that records the full path to the
        source files. Theses can later be referenced by providing
        _DUNE_TARGET_OBJECTS:<target>_ as one of the sources to dune_add_library
      
      .----------------------
      
      
      [[Imported from SVN: r7320]]
      949b33a5
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6984 · 8d18199e
      Markus Blatt authored
      Revision  r6984
      .----------------------
      [dunecontrol]
      Add new command bexec, a copy of exec with executes the given commands
      in the build directory.
      
      .----------------------
      
      
      [[Imported from SVN: r7319]]
      8d18199e
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6982 · 89d90739
      Markus Blatt authored
      Revision  r6982
      .----------------------
      Removed faulty else clause
      .----------------------
      
      
      [[Imported from SVN: r7318]]
      89d90739
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r6981 · 7f96b217
      Markus Blatt authored
      Initial message was : Synced with trunk
      
      [[Imported from SVN: r7317]]
      7f96b217
Loading