Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
xtpcpp
Manage
Activity
Members
Labels
Plan
Issues
19
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PAPPSO
xtpcpp
Commits
2640c01d
Commit
2640c01d
authored
6 years ago
by
Langella Olivier
Browse files
Options
Downloads
Patches
Plain Diff
xtpcpp (0.2.10-1) stretch
parent
c30ec13e
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
debian/changelog
+6
-0
6 additions, 0 deletions
debian/changelog
debian/control.cmake
+17
-3
17 additions, 3 deletions
debian/control.cmake
src/CMakeLists.txt
+5
-5
5 additions, 5 deletions
src/CMakeLists.txt
with
30 additions
and
10 deletions
CMakeLists.txt
+
2
−
2
View file @
2640c01d
...
...
@@ -33,7 +33,7 @@ ENDIF( CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo" )
set
(
CMAKE_CXX_STANDARD 14
)
#depending on libpappsomspp version :
SET
(
LIBPAPPSOMSPP_VERSION
"0.3.
2-1
"
)
SET
(
LIBPAPPSOMSPP_VERSION
"0.3.
3-2
"
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/debian/control.cmake
${
CMAKE_SOURCE_DIR
}
/debian/control @ONLY
)
...
...
@@ -41,7 +41,7 @@ SET(SOFTWARE_NAME "XTPcpp")
SET
(
XTPCPP_VERSION_MAJOR
"0"
)
SET
(
XTPCPP_VERSION_MINOR
"2"
)
SET
(
XTPCPP_VERSION_PATCH
"
9
"
)
SET
(
XTPCPP_VERSION_PATCH
"
10
"
)
SET
(
XTPCPP_VERSION
"
${
XTPCPP_VERSION_MAJOR
}
.
${
XTPCPP_VERSION_MINOR
}
.
${
XTPCPP_VERSION_PATCH
}
"
)
# Set the CMAKE_PREFIX_PATH for the find_library fonction when using non
...
...
This diff is collapsed.
Click to expand it.
debian/changelog
+
6
−
0
View file @
2640c01d
xtpcpp (0.2.10-1) stretch; urgency=medium
* better UI and XIC viewer
-- Olivier Langella <olivier.langella@u-psud.fr> Sun, 11 Feb 2018 08:02:37 +0100
xtpcpp (0.2.9-2) stretch; urgency=medium
* extract XIC in other MS runs
...
...
This diff is collapsed.
Click to expand it.
debian/control.cmake
+
17
−
3
View file @
2640c01d
...
...
@@ -3,14 +3,28 @@ Maintainer: Olivier Langella <olivier.langella@u-psud.fr>
Homepage: http://pappso.inra.fr/bioinfo
Section: libs
Priority: optional
Build-Depends:
debhelper
(
>= 9
)
,
cmake
(
>= 2.6
)
, qtbase5-dev, libpappsomspp-widget-
dev
(
= @LIBPAPPSOMSPP_VERSION@
)
, libpwiz-dev, libodsstream-dev, libboost1.62-dev, libqt5svg5-dev, libboost-dev
Build-Depends:
debhelper
(
>= 9
)
,
cmake
(
>= 2.6
)
,
qtbase5-dev,
libpappsomspp-widget-qt5-
dev
(
= @LIBPAPPSOMSPP_VERSION@
)
,
libpwiz-dev,
libodsstream-qt5-dev,
libboost1.62-dev,
libqt5svg5-dev,
libboost-dev
Standards-Version: 3.9.8
Package: xtpcpp
Architecture: any
Multi-Arch: no
Depends:
${
shlibs:Depends
}
,
${
misc:Depends
}
, libpappsomspp-widget-
qt5
(
= @LIBPAPPSOMSPP_VERSION@
)
, libpwiz3,
libodsstream-qt5, libqt5gui5, libqt5core5a, libqt5xml5, libqt5svg5
${
misc:Depends
}
,
libpappsomspp-widget-
qt5
(
= @LIBPAPPSOMSPP_VERSION@
)
,
libpwiz3,
libodsstream-qt5,
libqt5gui5,
libqt5core5a,
libqt5xml5,
libqt5svg5
Pre-Depends:
${
misc:Pre-Depends
}
Description: C++ version of X!TandemPipeline
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
5
−
5
View file @
2640c01d
...
...
@@ -27,12 +27,12 @@ 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_QT5_LIBRARY
"
${
PAPPSOMSPP_DIR
}
/cbuild/src/libpappsomspp-qt5.so"
)
SET
(
PAPPSOMSPP_WIDGET_QT5_LIBRARY
"
${
PAPPSOMSPP_DIR
}
/cbuild/src/pappsomspp/widget/libpappsomspp-widget-qt5.so"
)
#
SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
#
SET (PAPPSOMSPP_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt5.so")
#
SET (PAPPSOMSPP_WIDGET_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/pappsomspp/widget/libpappsomspp-widget-qt5.so")
# SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so")
IF
(
PAPPSOMSPP_QT5_FOUND
)
ELSE
(
PAPPSOMSPP_QT5_FOUND
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment