Skip to content
Snippets Groups Projects

Feature/fix install cmake

Merged Christoph Grüninger requested to merge feature/fix-install-cmake into releases/2.4

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
73 73 add_custom_target(doxygen_${ProjectName}
74 74 DEPENDS html)
75 75 add_dependencies(doc doxygen_${ProjectName})
76 endif(DOXYGEN_FOUND)
  • Probably because I never though about the location of dune.module and the *.lib files. Why are they in lib anyway?

    Maybe ${CMAKE_INSTALL_LIBDIR}/../lib would be better then CMAKE_INSTALL_BINDIR. Would that be ok for you?

  • Coming to think of it again, the real reason to use a path relative to CMAKE_INSTALL_BINDIR is:

    The problem was that user/sysadmin might overwrite CMAKE_INSTALL_LIBDIR and/or CMAKE_INSTALL_BINDIR. There is no easy for dunecontrol to guess which value CMAKE_INSTALL_LIBDIR was set to. But as dunecontrol gets installed into CMAKE_INSTALL_BINDIR it can assume that ${CMAKE_INSTALL_BINDIR}/../lib is the correct place of the lib.

    Note that for autotools we still have the same problem, but I was not willing to invest time there.

    Edited by Markus Blatt
  • Ok, that sounds like an argument. I'll give it a try whether I can modify the package build scripts accordingly. I'll report back.

  • The same holds for dune.module.

    Even in the current situation I am sure that I missed some scenarios. I guess the only way to be safe is to export the DUNE_INSTALL_NONOBJECTLIBDIR variable and possibly others with the package configuration file. Then dunecontrol can query the correct path from it using cmake. Might make dunecontrol a little less complicated...

  • Added 2 commits:

    • 6fcb9f2e - [CMake] Update error message to reflect all checked paths.
    • c2f3853c - [CMake] Don't add doxygen_${ProjectName} target without Doxygen
  • Ok, dropped two of the commits. Objections concerning the remaining two? I still consider it a bug if the doxygen_* target is created despite Doxygen is not found.

  • Christoph Grüninger Unmarked this merge request as a Work In Progress

    Unmarked this merge request as a Work In Progress

  • mentioned in commit fa6bc4af

  • Christoph Grüninger Status changed to merged

    Status changed to merged

  • Please register or sign in to reply
    Loading