Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Builder|Debian|CMake: Updated package metadata for source packaging
  • Loading branch information
skyjake committed May 24, 2015
1 parent ded134c commit bb15b38
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions distrib/debian/control.template
Expand Up @@ -2,15 +2,15 @@ Source: ${Package}
Section: universe/games
Priority: optional
Maintainer: Jaakko Keränen <jaakko.keranen@iki.fi>
Build-Depends: debhelper (>= 8.0.0), python, libsdl2-dev, libsdl2-mixer-dev, libxrandr-dev, libxxf86vm-dev, libqt4-network (>= 4.7), libqtcore4 (>= 4.7), libqtgui4 (>= 4.7), qt4-qmake (>= 4.7), libqt4-opengl-dev (>= 4.7), zlib1g-dev, libfluidsynth-dev, libncurses5-dev, cmake (>= 2.8)
Build-Depends: debhelper (>= 8.0.0), python, libsdl2-dev, libsdl2-mixer-dev, libxrandr-dev, libxxf86vm-dev, libqt4-network (>= 4.8), libqtcore4 (>= 4.8), libqtgui4 (>= 4.8), qt4-qmake (>= 4.8), libqt4-opengl-dev (>= 4.8), zlib1g-dev, libfluidsynth-dev, libncurses5-dev, cmake (>= 3.1)
Standards-Version: 3.9.3
Homepage: http://dengine.net/
Vcs-Git: https://github.com/skyjake/Doomsday-Engine.git
Vcs-Browser: http://github.com/skyjake/Doomsday-Engine

Package: ${Package}
Architecture: ${Arch}
Depends: ${shlibs:Depends}, ${misc:Depends}, python-wxgtk2.8
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Doom/Heretic/Hexen port with enhanced graphics
The Doomsday Engine is a portable version of the classic first person
shooters DOOM, Heretic, and Hexen. It lets you enjoy the original games
Expand Down
12 changes: 6 additions & 6 deletions distrib/debian/rules
Expand Up @@ -8,10 +8,10 @@ builddir:

builddir/Makefile: builddir
cd $(ASSIMP_DIR) && cmake -G "Unix Makefiles" && make -j2
cd builddir && qmake-qt4 PREFIX=/usr CONFIG+=deng_fluidsynth \
CONFIG+=deng_extassimp CONFIG+=release \
DENG_BUILD=`../build_number.py --print` \
../../doomsday/$(APPNAME).pro
cd builddir && cmake -DCMAKE_BUILD_TYPE=Release \
-DDENG_BUILD=`../build_number.py --print` \
-DASSIMP_DIR=$(ASSIMP_DIR) \
../../doomsday

build: build-arch build-indep
build-arch: build-stamp
Expand All @@ -36,8 +36,8 @@ install: build
dh_prep
dh_installdirs

# Add here commands to install the package into debian/your_appname
cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install
# Add here commands to install the package into debian/your_appname
cd builddir && $(MAKE) DESTDIR=$(CURDIR)/debian/$(APPNAME) install

# Build architecture-independent files here.
binary-indep: build install
Expand Down
4 changes: 2 additions & 2 deletions doomsday/cmake/FindAssimp.cmake
Expand Up @@ -3,7 +3,7 @@ find_package (PkgConfig QUIET)
set (_oldPath ${LIBASSIMP})

if (NOT TARGET assimp)
if (PKG_CONFIG_FOUND)
if (PKG_CONFIG_FOUND AND NOT DEFINED ASSIMP_DIR)
# Try to find assimp using pkg-config.
pkg_check_modules (ASSIMP QUIET assimp)
if (NOT ASSIMP_LIBRARIES)
Expand All @@ -27,7 +27,7 @@ if (NOT TARGET assimp)
mark_as_advanced (LIBASSIMP)

if (NOT LIBASSIMP)
message (FATAL_ERROR "Open Asset Import Library not found. Go to ${DENG_EXTERNAL_SOURCE_DIR}/assimp and compile. If you install it somewhere, set the ASSIMP_DIR variable to specify the location.")
message (FATAL_ERROR "Open Asset Import Library not found. Go to ${DENG_EXTERNAL_SOURCE_DIR}/assimp and compile. If you install it somewhere, set the ASSIMP_DIR variable to specify the location. If pkg-config is available, it is used to find libassimp.")
endif ()

add_library (assimp INTERFACE)
Expand Down

0 comments on commit bb15b38

Please sign in to comment.