diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a45f3d8530f6e6313ca4f80ed570078fe4700e1..02ba5fc2fb8582def2588a19db214fb1ce5b7224 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,11 +33,15 @@ ENDIF( CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo" )
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+#depending on libpappsomspp version :
+SET(LIBPAPPSOMSPP_VERSION "0.2.33-1~stretch")
+configure_file (${CMAKE_SOURCE_DIR}/debian/control.cmake ${CMAKE_SOURCE_DIR}/debian/control @ONLY)
+
SET(SOFTWARE_NAME "XTPcpp")
SET(XTPCPP_VERSION_MAJOR "0")
-SET(XTPCPP_VERSION_MINOR "2")
+SET(XTPCPP_VERSION_MINOR "1")
SET(XTPCPP_VERSION_PATCH "0")
SET(XTPCPP_VERSION "${XTPCPP_VERSION_MAJOR}.${XTPCPP_VERSION_MINOR}.${XTPCPP_VERSION_PATCH}")
@@ -67,11 +71,11 @@ ENDIF (DOXYGEN_FOUND)
# Packager
SET(CPACK_PACKAGE_NAME "xtpcpp")
SET(CPACK_PACKAGE_VENDOR "PAPPSO Development Team")
-SET(CPACK_PACKAGE_VERSION "${PAPPSOMSTOOLS_VERSION}")
-SET(CPACK_PACKAGE_VERSION_MAJOR "${PAPPSOMSTOOLS_VERSION_MAJOR}")
-SET(CPACK_PACKAGE_VERSION_MINOR "${PAPPSOMSTOOLS_VERSION_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${PAPPSOMSTOOLS_VERSION_PATCH}")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "various mass spectrometry and proteomics tools")
+SET(CPACK_PACKAGE_VERSION "${XTPCPP_VERSION}")
+SET(CPACK_PACKAGE_VERSION_MAJOR "${XTPCPP_VERSION_MAJOR}")
+SET(CPACK_PACKAGE_VERSION_MINOR "${XTPCPP_VERSION_MINOR}")
+SET(CPACK_PACKAGE_VERSION_PATCH "${XTPCPP_VERSION_PATCH}")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "protein inference tool")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
SET(CPACK_RESOURCE_FILE_AUTHORS "${CMAKE_SOURCE_DIR}/AUTHORS")
SET(CPACK_RESOURCE_FILE_INSTALL "${CMAKE_SOURCE_DIR}/INSTALL")
@@ -142,14 +146,14 @@ IF (UNIX)
add_custom_target(targz
- cpack -G TGZ --config CPackSourceConfig.cmake && tar xvfz ${CPACK_PACKAGE_NAME}-${PAPPSOMSTOOLS_VERSION}.tar.gz
+ cpack -G TGZ --config CPackSourceConfig.cmake && tar xvfz ${CPACK_PACKAGE_NAME}-${XTPCPP_VERSION}.tar.gz
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Creating .tar.gz" VERBATIM
)
add_custom_target(deb
- cd ${CPACK_PACKAGE_NAME}-${PAPPSOMSTOOLS_VERSION} && dpkg-buildpackage
+ cd ${CPACK_PACKAGE_NAME}-${XTPCPP_VERSION} && dpkg-buildpackage
DEPENDS targz
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Creating Debian package" VERBATIM
@@ -182,4 +186,7 @@ SET(UPDATE_OPTIONS "")
# ADD_SUBDIRECTORY(test)
#ENDIF(BUILD_TESTING)
-INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/src/xtpcpp DESTINATION bin)
\ No newline at end of file
+configure_file (${CMAKE_SOURCE_DIR}/templates/share/applications/xtpcpp.desktop.cmake ${CMAKE_BINARY_DIR}/templates/share/applications/xtpcpp.desktop)
+INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/src/xtpcpp DESTINATION bin)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/templates/share/applications/xtpcpp.desktop DESTINATION share/applications)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/resources/xtandempipeline_icon.svg DESTINATION share/xtpcpp)
diff --git a/debian/changelog b/debian/changelog
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1122bfb33d1a1eb94d0fa9446cb9e0ebf9ce3366 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -0,0 +1,6 @@
+xtpcpp (0.1.0-1) stretch; urgency=medium
+
+ * first package
+
+ -- Olivier Langella <olivier.langella@u-psud.fr> Tue, 18 Apr 2017 20:55:14 +0200
+
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 0040eb756f2d469a27d63b296f9b5eadaa60f514..0000000000000000000000000000000000000000
--- a/debian/control
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: xtpcpp
-Maintainer: Olivier Langella <Olivier.Langella@moulon.inra.fr>
-Homepage: http://pappso.inra.fr/bioinfo
-Section: libs
-Priority: optional
-Build-Depends: debhelper (>= 9), cmake (>= 2.6), libqt4-dev (>= 4.8), libpappsomspp-dev (= 0.2.32-3), libpwiz-dev, libodsstream-dev
-Standards-Version: 3.9.4
-
-Package: xtpcpp
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends},
- ${misc:Depends}, libpappsomspp-qt4 (= 0.2.32-3), libpwiz3,
- libodsstream-qt4, libqt4-gui, libqt4-svg, libqt4-xml
-Pre-Depends: ${misc:Pre-Depends}
-Description: C++ version of X!TandemPipeline
diff --git a/debian/control.cmake b/debian/control.cmake
index 77d5b7ba65c153ecbb156bb7280b0716a51f8381..1b1a1862fe7512686fb1240c1691475de925af40 100644
--- a/debian/control.cmake
+++ b/debian/control.cmake
@@ -1,5 +1,5 @@
Source: xtpcpp
-Maintainer: Olivier Langella <Olivier.Langella@moulon.inra.fr>
+Maintainer: Olivier Langella <olivier.langella@u-psud.fr>
Homepage: http://pappso.inra.fr/bioinfo
Section: libs
Priority: optional
diff --git a/debian/xtpcpp.install b/debian/xtpcpp.install
index d4c8f68034798a4f2c33e4a35cd602c878405a66..5ade46765ff423fc435ffefbf9ad8c374cf95efc 100644
--- a/debian/xtpcpp.install
+++ b/debian/xtpcpp.install
@@ -1,2 +1,3 @@
usr/bin/xtpcpp
usr/share/applications/xtpcpp.desktop
+usr/share/xtpcpp/xtandempipeline_icon.svg
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5e175a8f6d2f3af151988f1b049c899306d64964..d9c1965b449effb4fcc5f66f0bf19018cc95cf21 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,11 +27,11 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5
#sudo apt-get install libpappsomspp-dev
-#FIND_PACKAGE( Pappsomspp REQUIRED )
- SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp")
+FIND_PACKAGE( Pappsomspp REQUIRED )
+# SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp")
# SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp")
- SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
- SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so")
+# SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
+# SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules)
diff --git a/templates/share/applications/xtpcpp.desktop.cmake b/templates/share/applications/xtpcpp.desktop.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..32ab73490968a80453ba9f206287cd46c4dc0ad6
--- /dev/null
+++ b/templates/share/applications/xtpcpp.desktop.cmake
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=X!TandemPipeline C++
+Categories=Education;Science;Math;
+Comment=Protein inference tool
+Exec=${CMAKE_INSTALL_PREFIX}/bin/xtpcpp
+Icon=${CMAKE_INSTALL_PREFIX}/share/xtpcpp/xtandempipeline_icon.svg
+Terminal=false
+Type=Application
+StartupNotify=true