Editet cmakelists

mathmech/CMakeLists.txt

@@ -6,6 +6,16 @@ set (COMPS mathmech
            mm_trj
            mm_trj2pdb)
 
+# install options
+set (MM_PREFIX "mm_" CACHE STRING "Prefix for mathmech tools")
+if (CMAKE_COMPILER_IS_GNUCXX)
+  set (QWT_INCLUDE_PATH "/usr/include" CACHE STRING "Path to qwt include")
+  set (QWT_LIBRARY_PATH "/usr/lib" CACHE STRING "Path to qwt library")
+else ()
+  set (QWT_INCLUDE_PATH "C:/Qwt-6.1.0/include" CACHE STRING "Path to qwt include")
+  set (QWT_LIBRARY_PATH "C:/Qwt-6.1.0/lib" CACHE STRING "Path to qwt library")
+endif()
+
 foreach (COMP ${COMPS})
   add_subdirectory (${COMP})
 endforeach()

mathmech/PKGBUILD

@@ -11,7 +11,11 @@ license=('GPL')
 depends=('qt4' 'qwt')
 makedepends=('unzip' 'cmake' 'automoc4')
 source=(https://github.com/arcan1s/moldyn/releases/download/mm-1.0.1/${pkgname}-${pkgver}.zip)
-md5sums=('5fab4bc7707d580ff41d384b1875b32c')
+md5sums=('393d4ec5beb06a1ed1c62df67446ee3c')
+_cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr
+            -DQWT_INCLUDE_PATH=/usr/include/qwt
+            -DMM_PREFIX=mm_
+            -DCMAKE_BUILD_TYPE=Release"
 
 build ()
 {
@@ -20,7 +24,7 @@ build ()
     rm -rf build
   fi
   mkdir ${srcdir}/${pkgname}/build && cd ${srcdir}/${pkgname}/build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ../
+  cmake ${_cmakekeys} ../
   make
 }
 

mathmech/mathmech/src/CMakeLists.txt

@@ -28,9 +28,11 @@ message (STATUS "FORMS: ${FORMS}")
 # compile
 project (${PROJECT})
 # include_path
+link_directories (${QWT_LIBRARY_PATH})
 include_directories (${PROJECT_INCLUDE_DIR}/${PROJECT}
                      ${PROJECT_SOURCE_DIR}
-                     ${CMAKE_CURRENT_BINARY_DIR})
+                     ${CMAKE_CURRENT_BINARY_DIR}
+                     ${QWT_INCLUDE_PATH})
 
 find_package (Qt4 REQUIRED)
 include (${QT_USE_FILE})

mathmech/mathmech/src/statgengraphwindow.cpp

@@ -3,9 +3,9 @@
 #include <QKeyEvent>
 #include <QTextStream>
 
-#include <qwt/qwt_plot.h>
+#include <qwt_plot.h>
-#include <qwt/qwt_plot_curve.h>
+#include <qwt_plot_curve.h>
-#include <qwt/qwt_series_data.h>
+#include <qwt_series_data.h>
 
 #include "statgengraphwindow.h"
 #include "ui_statgengraphwindow.h"

mathmech/mathmech/src/statgengraphwindow.h

@@ -2,7 +2,7 @@
 #define STATGENGRAPHWINDOW_H
 
 #include <QMainWindow>
-#include <qwt/qwt_plot.h>
+#include <qwt_plot.h>
 
 namespace Ui {
   class StatgenGraphWindow;

mathmech/mm_agl/CMakeLists.txt

@@ -5,7 +5,7 @@ cmake_policy(SET CMP0011 NEW)
 cmake_policy(SET CMP0015 NEW)
 
 # set project name
-set (PROJECT mm_agl)
+set (PROJECT ${MM_PREFIX}agl)
 # set additional cmake file
 include (${PROJECT}.cmake)
 

mathmech/mm_envir/CMakeLists.txt

@@ -5,7 +5,7 @@ cmake_policy(SET CMP0011 NEW)
 cmake_policy(SET CMP0015 NEW)
 
 # set project name
-set (PROJECT mm_envir)
+set (PROJECT ${MM_PREFIX}envir)
 # set additional cmake file
 include (${PROJECT}.cmake)
 

mathmech/mm_radf/CMakeLists.txt

@@ -5,7 +5,7 @@ cmake_policy(SET CMP0011 NEW)
 cmake_policy(SET CMP0015 NEW)
 
 # set project name
-set (PROJECT mm_radf)
+set (PROJECT ${MM_PREFIX}radf)
 # set additional cmake file
 include (${PROJECT}.cmake)
 

mathmech/mm_statgen/CMakeLists.txt

@@ -5,7 +5,7 @@ cmake_policy(SET CMP0011 NEW)
 cmake_policy(SET CMP0015 NEW)
 
 # set project name
-set (PROJECT mm_statgen)
+set (PROJECT ${MM_PREFIX}statgen)
 # set additional cmake file
 include (${PROJECT}.cmake)
 

mathmech/mm_trj/CMakeLists.txt

@@ -5,7 +5,7 @@ cmake_policy(SET CMP0011 NEW)
 cmake_policy(SET CMP0015 NEW)
 
 # set project name
-set (PROJECT mm_trj)
+set (PROJECT ${MM_PREFIX}trj)
 # set additional cmake file
 include (${PROJECT}.cmake)
 

mathmech/mm_trj2pdb/CMakeLists.txt

@@ -5,7 +5,7 @@ cmake_policy(SET CMP0011 NEW)
 cmake_policy(SET CMP0015 NEW)
 
 # set project name
-set (PROJECT mm_trj2pdb)
+set (PROJECT ${MM_PREFIX}trj2pdb)
 # set additional cmake file
 include (${PROJECT}.cmake)