Merge branch 'master' of gitlab.lam.fr:jclamber/glnemo2

CMakeLists.txt

@@ -154,6 +154,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 include_directories (${PROJECT_SOURCE_DIR}/plugins ${PROJECT_SOURCE_DIR}/plugins/nemolight/inc ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/plugins/ftm ${PROJECT_SOURCE_DIR}/plugins/gadget ${PROJECT_SOURCE_DIR}/plugins/tipsy ${PROJECT_SOURCE_DIR}/src/glew ${PROJECT_SOURCE_DIR}/plugins/network ${PROJECT_SOURCE_DIR}/plugins/ramses ${PROJECT_SOURCE_DIR}/plugins/zlib ${PROJECT_SOURCE_DIR}/3rdparty/pfntlib ${PROJECT_SOURCE_DIR}/utils)
 include_directories (${Qt5Widgets_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} {Qt5PrintSupport_INCLUDE_DIRS})
 include_directories(/usr/include/CCfits /opt/local/include /opt/local/include/CCfits  /usr/include/cfitsio /usr/local/include/CCfits)
+include_directories(/usr/include/tirpc)
 include_directories(${PROJECT_SOURCE_DIR}/plugins/gadgeth5 ${HDF5_INCLUDE_DIRS})
 
 if (APPLE)
@@ -220,7 +221,13 @@ if (APPLE)
   set (GOMP "")
 endif()
 #target_link_libraries (glnemo2 uns z ${OPENGL_LIBRARY}  ${QT_LIBRARIES} ${GOMP} CCfits cfitsio ${HDF5_CXX_LIBRARIES_LIST} )
-target_link_libraries (glnemo2 uns z ${OPENGL_LIBRARY}  ${QT_LIBRARIES} ${GOMP} CCfits cfitsio ${HDF5_CXX_LIBRARIES} )
+# special ARCH LINUX
+if (EXISTS "/usr/lib64/libtirpc.so")
+   set (TIRPC "tirpc")
+else()
+   set (TIRPC "")
+endif()
+target_link_libraries (glnemo2 uns z ${OPENGL_LIBRARY}  ${QT_LIBRARIES} ${GOMP} CCfits cfitsio ${TIRPC}  ${HDF5_CXX_LIBRARIES} )
 
 qt5_use_modules(glnemo2 Gui Widgets Core OpenGL Network PrintSupport)
 

PKGBUILD

+# Contributor: masutu <masutu dot atch at gmail dot com>
+# Contributor: Jonathan Fine <were.Vire@gmail.com>
+# Maintainer: Simon Conseil <contact+aur at saimon dot org>
+pkgname=glnemo2
+pkgver=1.11.0
+pkgrel=1
+pkgdesc="an interactive visualization 3D program for nbody snapshots."
+arch=('i686' 'x86_64')
+url="http://projets.oamp.fr/projects/glnemo2"
+license=('GPL')
+depends=( 'glu' 'qt5-base' 'ccfits' 'hdf5-cpp-fortran')
+#source=(http://projets.lam.fr/attachments/download/2892/${pkgname}-${pkgver}.tar.gz)
+#md5sums=('d012fc4d0ca59275641e2de15ec499b4')
+#noextract=( ${source[@]##*/} )
+srcdir='./'
+
+build() {
+  cd .. 
+  mkdir -p build
+  cd build 
+  cmake ..
+  make -j 4
+}
+
+package() {
+  # cd $srcdir/$pkgname
+
+  cd ../build
+  install -D -m755 bin/glnemo2 $pkgdir/usr/bin/glnemo2
+  install -D -m644 ../man/man1/glnemo2.1 $pkgdir/usr/share/man/man1/glnemo2.1
+}
+
+# vim:set ts=2 sw=2 et:
+

cmake/DetectCpackGenerator.cmake

@@ -51,6 +51,13 @@ if(UNIX)
         set(SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "RPM")      
 	MESSAGE (STATUS "Mageia :" ${LINUX_NAME})
       endif(LINUX_ISSUE MATCHES "Mageia")
+      # Arch Linux
+      if(LINUX_ISSUE MATCHES "Arch")
+        set(MY_OS "Arch")
+        set(LINUX_NAME "arch")  
+        #set(SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "RPM")      
+        MESSAGE (STATUS "Arch Linux :" ${LINUX_NAME})
+      endif(LINUX_ISSUE MATCHES "Arch")
       # Fedora case
       if(LINUX_ISSUE MATCHES "Fedora")
 	set(MY_OS "Fedora")