Skip to content
Snippets Groups Projects

Feaure/dont use ug symlinks

Merged Christoph Grüninger requested to merge feaure/dont-use-ug-symlinks into master
1 unresolved thread

The hack to have every sub-directory in the include path does no longer work for me. Time to get it fixed by making the include paths relative to dune-uggrid root directory.

  • include paths relative to dune-uggrid root directory
  • move header files below dune/uggrid/.
  • drop folder ug/ and compatibility with UG 3.13.

Supersedes !137 (closed) Fixes #13 (closed)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
147 147
148 148 set(CMAKE_INSTALL_PKGINCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/ug")
149 149
150 # create and install pkg-config information and
151 # cmake package configuration as ug not dune-uggrid
152 set(prefix ${CMAKE_INSTALL_PREFIX})
153 set(exec_prefix "\${prefix}")
154 set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
155 set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
156 if(UG_ENABLE_PARALLEL)
157 set(parallel "yes")
158 else()
159 set(parallel "no")
160 endif()
  • added 2 commits

    • 520f3ddf - [CMAKE] Properly set UG_PARALLEL
    • 660cbe86 - [cmake] Add closing parantheses in CMake cache comments

    Compare with previous version

  • Oliver Sander mentioned in commit 1766c59e

    mentioned in commit 1766c59e

  • merged

  • Please register or sign in to reply
    Loading