Permalink
Browse files

修改cmake

  • Loading branch information...
zhanlangsir committed Feb 12, 2013
1 parent 5088133 commit 3df02a35b1584e8b63720f956984d9a7c453fed0
Showing with 42 additions and 12 deletions.
  1. +1 −1 CMakeLists.txt
  2. +39 −0 arch/PKGBUILD
  3. +1 −1 src/CMakeLists.txt
  4. +1 −1 src/plugins/notifier/CMakeLists.txt
  5. 0 src/protocol/types.cpp
  6. +0 −9 src/protocol/types.h
View
@@ -34,7 +34,7 @@ if ( CMAKE_BUILD_TYPE MATCHES "Debug" )
else ()
set(prefix ${CMAKE_INSTALL_PREFIX})
set(pkgdatadir ${prefix}/share/${package})
- set(PLUGIN_DIR ${libdir}/plugins)
+ set(PLUGIN_DIR ${prefix}/lib/${PROJECT_NAME}/plugins)
endif ()
set(bindir ${prefix}/bin)
View
@@ -0,0 +1,39 @@
+# Maintainer: zhanlang <zhanlangsir@gmail.com>
+pkgname=qtqq-dev
+pkgver=0.8.1-alpha
+pkgrel=1
+pkgdesc="Qtqq on dev branch"
+arch=('i686' 'x86_64')
+url="https://github.com/zhanlangsir/Qtqq"
+license=('GPL')
+depends=('qt' 'mpg123' 'qtwebkit')
+makedepends=('git' 'cmake' 'json-glib')
+
+_gitname="qtqq"
+_gitroot="git://github.com/zhanlangsir/Qtqq.git"
+_gitbranch="qtqq-dev"
+
+build() {
+ cd $srcdir
+ msg $srcdir
+ msg "Connecting to GIT server...."
+
+ if [ -d $_gitname ] ; then
+ cd $_gitname && git pull origin && cd ..
+ msg "The local files are updated."
+ else
+ git clone $_gitroot $_gitname -b $_gitbranch
+ fi
+
+ msg "Clone done, starting make..."
+
+ rm -rf "$_gitname-build"
+ cp -a "$_gitname" "${_gitname}-build"
+
+ mkdir -p ${pkgdir}/usr/bin
+ cd "${_gitname}-build"
+
+ cmake . -DCMAKE_INSTALL_PREFIX="/usr"
+ make
+ make install DESTDIR="${pkgdir}"
+}
View
@@ -311,7 +311,7 @@ option(UPDATE_TRANSLATIONS "Update source translation files" OFF)
# QT4_ADD_TRANSLATION(QM_FILES ${TRANSLATIONS_FILES})
#endif (UPDATE_TRANSLATIONS)
-add_subdirectory(plugins EXCLUDE_FROM_ALL)
+add_subdirectory(plugins)
add_executable(qtqq
${CORE_SOURCES} ${CORE_HEADERS_MOC}
@@ -16,7 +16,7 @@ set(UIS
notifywidget.ui
)
-include_directories(".")
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ".")
QT4_WRAP_CPP(MOCA_SOURCES ${HEADERS})
qt4_wrap_ui(NOTIFIER_UI_HEADERS ${UIS})
View
No changes.
View
@@ -1,9 +0,0 @@
-#ifndef TYPES_H
-#define TYPES_H
-
-struct FileRecItem
-{
-
-};
-
-#endif //TYPES_H

0 comments on commit 3df02a3

Please sign in to comment.