Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Maintenance - Mise à jour mensuelle Lundi 6 Février entre 7h00 et 9h00
Open sidebar
PAPPSO
MassChroQ
Commits
92e0100b
Commit
92e0100b
authored
Sep 23, 2017
by
Langella Olivier
Browse files
WIP: QT5 migration
parent
438788c3
Changes
2
Hide whitespace changes
Inline
Side-by-side
debian/control.cmake
View file @
92e0100b
...
...
@@ -6,7 +6,7 @@ Uploaders: Olivier Langella <olivier.langella@u-psud.fr>
DM-Upload-Allowed: yes
Standards-Version: 3.9.1.0
Build-Depends:
debhelper
(
>= 5
)
,
cmake
(
>= 2.6
)
, libx11-dev, libc6-dev, qt5-default,
libqwt-
dev
(
>=6.0.0
)
, texlive-latex-extra, texlive-latex-recommended, texlive-fonts-recommended,
libqwt-
qt5-dev
, texlive-latex-extra, texlive-latex-recommended, texlive-fonts-recommended,
texlive-science, hevea, inkscape, doxygen, libpappsomspp-
dev
(
= @LIBPAPPSOMSPP_VERSION@
)
, libodsstream-
dev
(
>=0.4.4
)
,
libqt5xmlpatterns5-dev
Build-Conflicts: qt3-dev-tools
...
...
@@ -65,7 +65,7 @@ Description: Mass Chromatogram Quantification graphical user interface
Package: masschroq-studio
Architecture: any
Depends:
${
shlibs:Depends
}
, masschroq-
common
(
=
${
binary:Version
}
)
, libqt5core5a, libqt5gui5, libqt5xml5,
libqwt
6abi1
(
>= 6.0.0
)
libqwt
-qt5-6
Suggests: masschroq-doc, masschroq-gui
Description: Mass Chromatogram Quantification graphical user interface to edit parameters
MassChroQ
(
Mass Chromatogram Quantification
)
software performs quantification
...
...
src/CMakeLists.txt
View file @
92e0100b
...
...
@@ -312,7 +312,7 @@ ELSE (MINGW32)
IF
(
NOQWT
)
ELSE
(
NOQWT
)
ADD_EXECUTABLE
(
masschroq_studio gui/parameterGui.cpp
${
STUDIO_SRCS
}
${
STUDIO_MOC_SRCS
}
)
TARGET_LINK_LIBRARIES
(
masschroq_studio
${
MASSCHROQ_LIB_NAME
}
Qt5::Core Qt5::Gui Qt5::Widgets
${
Qwt6_
Qt5_
LIBRARY
}
${
PAPPSOMSPP_QT5_LIBRARY
}
${
ODSSTREAM_QT5_LIBRARY
}
)
TARGET_LINK_LIBRARIES
(
masschroq_studio
${
MASSCHROQ_LIB_NAME
}
Qt5::Core Qt5::Gui Qt5::Widgets
${
Qwt6_LIBRARY
}
${
PAPPSOMSPP_QT5_LIBRARY
}
${
ODSSTREAM_QT5_LIBRARY
}
)
ENDIF
(
NOQWT
)
ENDIF
(
NOGUI
)
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment