From 071affe7ad0bfede9f521d88f5d3ac2142d3fdc2 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Wed, 29 Jan 2014 04:46:39 +0400 Subject: [PATCH] fixed building library --- mathmech/PKGBUILD | 16 ++++++++-------- mathmech/mm/src/CMakeLists.txt | 5 ++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/mathmech/PKGBUILD b/mathmech/PKGBUILD index d040587..7777b8b 100644 --- a/mathmech/PKGBUILD +++ b/mathmech/PKGBUILD @@ -1,17 +1,17 @@ -# Author: Evgeniy "arcanis" Alexeev -# Maintainer: Evgeniy "arcanis" Alexeev +# Author: Evgeniy "arcanis" Alexeev +# Maintainer: Evgeniy "arcanis" Alexeev pkgname=mathmech pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Software package for analysis of molecular dynamics trajectories" -arch=(any) +arch=('i686' 'x86_64') url="http://arcan1s.github.io/projects/moldyn" license=('Beerware') -depends=('qt4' 'qwt') +depends=('qwt') makedepends=('cmake' 'automoc4') source=(https://github.com/arcan1s/moldyn/releases/download/mm-${pkgver}/${pkgname}-${pkgver}-src.zip) -md5sums=('f3f01c7eefdedf23b4eadfbf59058332') +md5sums=('46d8e1a3d6bc30d5b0b57ccf485986b1') _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DQWT_INCLUDE_PATH=/usr/include/qwt -DQWT_LIBRARY_PATH=/usr/lib @@ -25,7 +25,7 @@ prepare() { mkdir "${srcdir}/build" } -build () { +build() { cd "${srcdir}/build" cmake ${_cmakekeys} ../ make @@ -34,6 +34,6 @@ build () { package() { cd "${srcdir}/build" make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/mathmech/mm/src/CMakeLists.txt b/mathmech/mm/src/CMakeLists.txt index 0a188ba..85b5f08 100644 --- a/mathmech/mm/src/CMakeLists.txt +++ b/mathmech/mm/src/CMakeLists.txt @@ -15,12 +15,15 @@ message (STATUS "${SUBPROJECT} HEADERS: ${HEADERS}") # link libraries and compile add_library (${SUBPROJECT} SHARED ${SOURCES} ${HEADERS}) -add_library (${SUBPROJECT} STATIC ${SOURCES} ${HEADERS}) set_target_properties (${SUBPROJECT} PROPERTIES SOVERSION ${PROJECT_VERSION}) target_link_libraries (${SUBPROJECT} ${ADDITIONAL_LIB}) +add_library (${SUBPROJECT}_STATIC STATIC ${SOURCES} ${HEADERS}) +set_target_properties(${SUBPROJECT}_STATIC PROPERTIES OUTPUT_NAME ${SUBPROJECT}) +target_link_libraries (${SUBPROJECT} ${ADDITIONAL_LIB}) # install properties install (TARGETS ${SUBPROJECT} DESTINATION lib) +install (TARGETS ${SUBPROJECT}_STATIC DESTINATION lib) if (ADD_INCLUDE) install (DIRECTORY ${SUBPROJECT_INCLUDE_DIR}/ DESTINATION include/) endif ()