Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed|Debian: Incorrect dependency in DEB metadata
There were two issues here:
1) The name of the libassimp library on Debian/Ubuntu is "libassimp4".
2) The packaging configuration failed to correctly check if the
   library is actually needed (by default, it isn't).

IssueID #2412
  • Loading branch information
skyjake committed Mar 4, 2020
1 parent 003f74e commit 8fa624d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 2 additions & 0 deletions doomsday/cmake/Options.cmake
Expand Up @@ -51,3 +51,5 @@ option (DENG_ENABLE_COUNTED_TRACING
if (DENG_ENABLE_COUNTED_TRACING)
add_definitions (-DDENG_USE_COUNTED_TRACING=1)
endif ()

option (DENG_ASSIMP_EMBEDDED "Use the Assimp from 'external/assimp' instead of system libraries" YES)
2 changes: 1 addition & 1 deletion doomsday/cmake/Packaging.cmake
Expand Up @@ -12,7 +12,7 @@ set (CPACK_DEBIAN_PACKAGE_MAINTAINER "Jaakko Keränen (skyjake) <jaakko.keranen@
set (CPACK_DEBIAN_PACKAGE_SECTION universe/games)
set (CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5gui5, libqt5x11extras5, libsdl2-mixer-2.0-0, libxrandr2, libxxf86vm1, libncurses5, libfluidsynth1, libminizip1")
if (NOT DENG_ASSIMP_EMBEDDED)
string (APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ", libassimp")
string (APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ", libassimp4")
endif ()

set (CPACK_RPM_PACKAGE_SUMMARY ${summary})
Expand Down
2 changes: 0 additions & 2 deletions doomsday/sdk/libgui/CMakeLists.txt
Expand Up @@ -3,8 +3,6 @@
cmake_minimum_required (VERSION 3.1)
project (DENG_LIBGUI)

option (DENG_ASSIMP_EMBEDDED "Use the Assimp from 'external/assimp' instead of system libraries" YES)

set (CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)

#----------------------------------------------------------------------------------------
Expand Down

0 comments on commit 8fa624d

Please sign in to comment.