Skip to content
Snippets Groups Projects
  1. Feb 19, 2013
    • 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
    • Markus Blatt's avatar
      [Merge][CMake] Block revision r6976 · 266aa6a5
      Markus Blatt authored
      Initial message was : Synced with current trunk version
      
      [[Imported from SVN: r7316]]
      266aa6a5
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6974 · f9d25688
      Markus Blatt authored
      Revision  r6974
      .----------------------
      Now creates the necessary target for building the doxygen
      documentation.
      Script now adds cmake support to existing modules and these modules
      build with cmake.
      
      .----------------------
      
      
      [[Imported from SVN: r7315]]
      f9d25688
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6973 · e1ff76b6
      Markus Blatt authored
      Revision  r6973
      .----------------------
      Prevent globbing for CMake modules.
      
      .----------------------
      
      
      [[Imported from SVN: r7314]]
      e1ff76b6
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6972 · c5b4b4ed
      Markus Blatt authored
      Revision  r6972
      .----------------------
      Set <package>_DIR correctly for installed packages.
      
      .----------------------
      
      
      [[Imported from SVN: r7313]]
      c5b4b4ed
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6971 · e2a16f87
      Markus Blatt authored
      Revision  r6971
      .----------------------
      Provide missing flags.
      
      .----------------------
      
      
      [[Imported from SVN: r7312]]
      e2a16f87
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6970 · 8a7901d6
      Markus Blatt authored
      Revision  r6970
      .----------------------
      Only print if there are libs.
      
      .----------------------
      
      
      [[Imported from SVN: r7311]]
      8a7901d6
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6969 · ec520ac3
      Markus Blatt authored
      Revision  r6969
      .----------------------
      Install am2cmake.py.
      
      .----------------------
      
      
      [[Imported from SVN: r7310]]
      ec520ac3
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6968 · bdde0ec8
      Markus Blatt authored
      Revision  r6968
      .----------------------
      Added timeout.
      
      .----------------------
      
      
      [[Imported from SVN: r7309]]
      bdde0ec8
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6967 · ac48561a
      Markus Blatt authored
      Revision  r6967
      .----------------------
      Determine doxygen files during make install. Otherwise file(GLOB) is
      run only during configure.
      
      .----------------------
      
      
      [[Imported from SVN: r7308]]
      ac48561a
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6966 · 872171de
      Markus Blatt authored
      Revision  r6966
      .----------------------
      Fixed image conversion.
      
      .----------------------
      
      
      [[Imported from SVN: r7307]]
      872171de
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6965 · 6472dfa6
      Markus Blatt authored
      Revision  r6965
      .----------------------
      We need to use the full path for the installation.
      
      .----------------------
      
      
      [[Imported from SVN: r7306]]
      6472dfa6
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6964 · 863006a2
      Markus Blatt authored
      Revision  r6964
      .----------------------
      Use file(INSTALL) to install doxygen documentation.
      The previous approach failed if there were to many files for the shell.
      
      .----------------------
      
      
      [[Imported from SVN: r7305]]
      863006a2
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6963 · c395215f
      Markus Blatt authored
      Revision  r6963
      .----------------------
      Search in  default locations, too. Two finds are need: a first with
      the user supplied path and the NO_DEFAULT_PATH option and a second
      without PATH and NO_DEFAULT_PATH.
      
      Removed ifclauses around second search as due to caching the search
      will not be performed if the first find was successful.
      
      .----------------------
      
      
      [[Imported from SVN: r7304]]
      c395215f
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6962 · 8bf7cf55
      Markus Blatt authored
      Revision  r6962
      .----------------------
      [CMake]
      Fix ParMETIS part of FindParMETIS.cmake, tested with dune-istl and ParMETIS 3.2 / ParMETIS 4.0.
      
      .----------------------
      
      
      [[Imported from SVN: r7303]]
      8bf7cf55
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6961 · f51b88c0
      Markus Blatt authored
      Revision  r6961
      .----------------------
      Set Requires.
      
      .----------------------
      
      
      [[Imported from SVN: r7302]]
      f51b88c0
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6960 · b56eab6a
      Markus Blatt authored
      Revision  r6960
      .----------------------
      provid libs to dune_add_library to make them a dependency for exported libraries.
      
      .----------------------
      
      
      [[Imported from SVN: r7301]]
      b56eab6a
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6959 · b5098159
      Markus Blatt authored
      Revision  r6959
      .----------------------
      adapt duneproject to latest changes.
      
      .----------------------
      
      
      [[Imported from SVN: r7300]]
      b5098159
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6958 · 73ae0dde
      Markus Blatt authored
      Revision  r6958
      .----------------------
      Do not print an empty line if no files were found.
      
      .----------------------
      
      
      [[Imported from SVN: r7299]]
      73ae0dde
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6957 · 2dbc4bf9
      Markus Blatt authored
      Revision  r6957
      .----------------------
      Bugfixed dependency resolution.
      dune_add_library now appends targets for export if necessary.
      
      .----------------------
      
      
      [[Imported from SVN: r7298]]
      2dbc4bf9
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6956 · abd5b1db
      Markus Blatt authored
      Revision  r6956
      .----------------------
      No need to export target seperately. This is already handeled by dune_add_library.
      
      .----------------------
      
      
      [[Imported from SVN: r7297]]
      abd5b1db
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6955 · 44641d94
      Markus Blatt authored
      Revision  r6955
      .----------------------
      [dunecontrol]
      Use BUILDIR from opts file only if not empty string (=is set).
      
      .----------------------
      
      
      [[Imported from SVN: r7296]]
      44641d94
    • Markus Blatt's avatar
      [Merge][CMake] Merged revisions : 6951 · da645067
      Markus Blatt authored
      Revision  r6951
      .----------------------
      [dunecontrol]
      Change default build dir from cmake-build to build-cmake to facilitate tab completion.
      
      .----------------------
      
      
      [[Imported from SVN: r7295]]
      da645067
Loading