Skip to content
Snippets Groups Projects
  1. Feb 20, 2013
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r1724 · 07edee7d
      Markus Blatt authored
      Initial message was : Merged bugfix from trunk
      
      [[Imported from SVN: r1852]]
      07edee7d
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1722 · 4fd9a85d
      Markus Blatt authored
      Revision  r1722
      .----------------------
      find_package(SuperLU) failed with an error if SuperLU was not found.
      This was due to the fact that find_<lib|file>(varname ...) sets
      ${varname} to varname-NOTFOUND if nothing is found.
      Therefore using the variable varname in
      CMAKE_REQUIRED_<LIBRARIES|INCLUDES> is a really bad idea.
      
      We are preventing this now by checking the variables first.
      
      .----------------------
      
      
      [[Imported from SVN: r1851]]
      4fd9a85d
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1721 · 7aeace03
      Markus Blatt authored
      Revision  r1721
      .----------------------
      Export PREFIX to find config.h.cmake
      .----------------------
      
      
      [[Imported from SVN: r1850]]
      7aeace03
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1720 · cc5c6a8b
      Markus Blatt authored
      Revision  r1720
      .----------------------
      Correct prefix path.
      
      .----------------------
      
      
      [[Imported from SVN: r1849]]
      cc5c6a8b
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r1719 · 535d1583
      Markus Blatt authored
      Initial message was : Merged latest patches from the trunk
      
      [[Imported from SVN: r1848]]
      535d1583
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1714 · 182bb01d
      Markus Blatt authored
      Revision  r1714
      .----------------------
      - 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
      
      .----------------------
      
      
      [[Imported from SVN: r1847]]
      182bb01d
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r1710 · 1db60f6a
      Markus Blatt authored
      Initial message was : Merged latest changes from the trunk
      
      [[Imported from SVN: r1846]]
      1db60f6a
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1708 · 8e8c455e
      Markus Blatt authored
      Revision  r1708
      .----------------------
      Use GNUInstallDir to specify installation directory.
      
      .----------------------
      
      
      [[Imported from SVN: r1845]]
      8e8c455e
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1707 · 4f5ae9fe
      Markus Blatt authored
      Revision  r1707
      .----------------------
      - Got rid off debugging output.
      - Removed dependency on cmake version 2.8.9
      
      .----------------------
      
      
      [[Imported from SVN: r1844]]
      4f5ae9fe
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1706 · 4b01ee30
      Markus Blatt authored
      Revision  r1706
      .----------------------
      [FindSuperLU.cmake] Add missing BLAS libraries for tests.
      
      .----------------------
      
      
      [[Imported from SVN: r1843]]
      4b01ee30
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1704 · 6014d8e3
      Markus Blatt authored
      Revision  r1704
      .----------------------
      Added missing superlu flags.
      .----------------------
      
      
      [[Imported from SVN: r1842]]
      6014d8e3
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1703 · 6c682a81
      Markus Blatt authored
      Revision  r1703
      .----------------------
      [FindSuperLU.cmake]
      Make sure the function add_dune_superlu_flags is always defined.
      
      .----------------------
      
      
      [[Imported from SVN: r1841]]
      6c682a81
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1698 · 38aa1cb3
      Markus Blatt authored
      Revision  r1698
      .----------------------
      [FindSuperLU.cmake] Fix handling of failing BLAS check.
      
      .----------------------
      
      
      [[Imported from SVN: r1840]]
      38aa1cb3
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1696 · 4f941295
      Markus Blatt authored
      Revision  r1696
      .----------------------
      [FindSuperLU.cmake]
      Add missing include.
      Improve library search.
      
      .----------------------
      
      
      [[Imported from SVN: r1839]]
      4f941295
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1695 · 1af1de73
      Markus Blatt authored
      Revision  r1695
      .----------------------
      [FindSuperLU.cmake]
      Rework SuperLU check; it conforms to the way CMake wants checks. Thanks to Markus Blatt for the hints.
      
      .----------------------
      
      
      [[Imported from SVN: r1838]]
      1af1de73
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r1694 · cbdfdfc5
      Markus Blatt authored
      Initial message was : Synced with trunk and added new tests to CMakeLists.txt
      
      [[Imported from SVN: r1837]]
      cbdfdfc5
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r1680 · ddde0853
      Markus Blatt authored
      Initial message was : Merged modification from trunk. Branch is up to date now.
      
      We now append the definitions used for SuperLU to COMPILE_DEFINITIONS rather than overwriten COMPILE_FLAGS on the target.
      Fixed some definitions that were obviously wrong.
      
      [[Imported from SVN: r1836]]
      ddde0853
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r1679 · 4954b004
      Markus Blatt authored
      Initial message was : Update merge info.
      
      [[Imported from SVN: r1835]]
      4954b004
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1678 · f540c96c
      Markus Blatt authored
      Revision  r1678
      .----------------------
      Export dependencies.
      
      .----------------------
      
      
      [[Imported from SVN: r1834]]
      f540c96c
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1677 · 34248087
      Markus Blatt authored
      Revision  r1677
      .----------------------
      Define istl information, too.
      
      .----------------------
      
      
      [[Imported from SVN: r1833]]
      34248087
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1676 · 4edfff74
      Markus Blatt authored
      Revision  r1676
      .----------------------
      Update minimum version.
      
      .----------------------
      
      
      [[Imported from SVN: r1832]]
      4edfff74
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r1660 · 2d97cdb6
      Markus Blatt authored
      Initial message was : Synced with trunk (patches 1652-1659
      
      These patches realized the following:
      - better complex support
      - Adapted ist autoconf test to changes in ParMETIS test.
      
      
      [[Imported from SVN: r1831]]
      2d97cdb6
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1655 · e47d3728
      Markus Blatt authored
      Revision  r1655
      .----------------------
      [FindSuperLU]
      Add test for HAVE_MEM_USAGE_T_EXPANSIONS needed for SuperLU 3.0.
      This fixes CMake Bug #133.
      
      .----------------------
      
      
      [[Imported from SVN: r1830]]
      e47d3728
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1654 · 3a5e2e24
      Markus Blatt authored
      Revision  r1654
      .----------------------
      Corrected enable trick.
      
      .----------------------
      
      
      [[Imported from SVN: r1829]]
      3a5e2e24
    • Markus Blatt's avatar
      Again config.h.cmake disappeared magically. Adding that of revision 1653 manually. · 76490504
      Markus Blatt authored
      [[Imported from SVN: r1828]]
      76490504
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1653 · af61f279
      Markus Blatt authored
      Revision  r1653
      .----------------------
      Activate dotproducttest. (Sorry for reordering the tests).
      
      .----------------------
      
      
      [[Imported from SVN: r1827]]
      af61f279
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r1652 · 409dcdae
      Markus Blatt authored
      Initial message was : Merged changes from the trunk and adaped header lists in CMakeLists.txt
      
      [[Imported from SVN: r1826]]
      409dcdae
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r1629 · e386bd8f
      Markus Blatt authored
      Initial message was : Synced with trunk
      
      [[Imported from SVN: r1825]]
      e386bd8f
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r1625 · c8852f9e
      Markus Blatt authored
      Initial message was : Synced with trunk
      
      [[Imported from SVN: r1824]]
      c8852f9e
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r1619 · 74af84dc
      Markus Blatt authored
      Initial message was : Merged changes from the trunk
      
      [[Imported from SVN: r1823]]
      74af84dc
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1616 · 21f32776
      Markus Blatt authored
      Revision  r1616
      .----------------------
      [CMake] Add MPITESTS and PARMETISTESTS only conditionally to ALLTESTS.
      
      .----------------------
      
      
      [[Imported from SVN: r1822]]
      21f32776
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1615 · 54a6f68f
      Markus Blatt authored
      Revision  r1615
      .---------------------------
      [CMake]
      Add HAVE_SUPERLU et al. to config.h.
      Update test set up to handle SuperLU tests correctly.
      
      
      [[Imported from SVN: r1821]]
      54a6f68f
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1614 · 49648763
      Markus Blatt authored
      Revision  r1614
      .----------------------
      Remove config.* from svn:ignore as it shadowed config.h.cmake. Added config.h.cmake
      .----------------------
      
      
      [[Imported from SVN: r1820]]
      49648763
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1613 · bcce024a
      Markus Blatt authored
      Revision  r1613
      .----------------------
      [CMake]
      Some variable from FindSuperLU.cmake are now cached.
      Added function add_dune_superlu_flags.
      
      .----------------------
      
      
      [[Imported from SVN: r1819]]
      bcce024a
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1606 · 52449a10
      Markus Blatt authored
      Revision  r1606
      .----------------------
      [CMake] Renamed SUPERLU_ROOT to SUPERLU_DIR, seems to be a more common name.
      
      .----------------------
      
      
      [[Imported from SVN: r1818]]
      52449a10
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1605 · c56e4801
      Markus Blatt authored
      Revision  r1605
      .----------------------
      [CMake] A hint where SuperLU is located can be given by SUPERLU_ROOT. If
      it is not found there, it silencely fails and searchs the default installtion
      locations.
      
      .----------------------
      
      
      [[Imported from SVN: r1817]]
      c56e4801
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1604 · 0c2bac65
      Markus Blatt authored
      Revision  r1604
      .----------------------
      [CMake] Now the superlu library names are more platform independant.
      
      .----------------------
      
      
      [[Imported from SVN: r1816]]
      0c2bac65
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1603 · 05f05871
      Markus Blatt authored
      Revision  r1603
      .----------------------
      [CMake] Use guards to conditionally set MPITESTS, otherwise cmake
      aborts.
      
      This differs from the way we handle tests requiring MPI compared to
      dune-common. Maybe we should discuss which way we want to use in Dune in
      general: HAVE_* macros or build guards in Makefile.am/CMakeLists.txt.
      
      .----------------------
      
      
      [[Imported from SVN: r1815]]
      05f05871
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1602 · ea15ba8c
      Markus Blatt authored
      Revision  r1602
      .----------------------
      [CMake] Add FindSuperLU.cmake. HAVE_SUPERLU is not yet set, it'll follow.
      
      .----------------------
      
      
      [[Imported from SVN: r1814]]
      ea15ba8c
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 1598 · ada04632
      Markus Blatt authored
      Revision  r1598
      .----------------------
      Use the new macro name.
      
      .----------------------
      
      
      [[Imported from SVN: r1813]]
      ada04632
Loading