Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PAPPSO
MassChroQ
Commits
38e91487
Commit
38e91487
authored
May 18, 2020
by
Langella Olivier
Browse files
masschroq (2.2.21-4) buster
parent
2a1f9625
Changes
4
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
38e91487
...
...
@@ -102,7 +102,7 @@ message("")
#depending on libpappsomspp version :
set
(
LIBPAPPSOMSPP_VERSION
"0.7.
3-2
"
)
set
(
LIBPAPPSOMSPP_VERSION
"0.7.
7-1
"
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/debian/control.cmake
${
CMAKE_SOURCE_DIR
}
/debian/control @ONLY
)
# Project version
...
...
debian/changelog
View file @
38e91487
masschroq (2.2.21-4) buster; urgency=medium
* new PAPPSOms++ library
-- Olivier Langella <olivier.langella@u-psud.fr> Mon, 18 May 2020 14:38:00 +0200
masschroq (2.2.21-3) buster; urgency=medium
* new libpappsomspp library
...
...
debian/control.cmake
View file @
38e91487
...
...
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 5),
libpappsomspp-
dev
(
= @LIBPAPPSOMSPP_VERSION@
)
,
libpappsomspp-widget-
dev
(
= @LIBPAPPSOMSPP_VERSION@
)
,
libpappsomspp-
widget0
(
= @LIBPAPPSOMSPP_VERSION@
)
,
libodsstream-
qt5-
dev
(
>= 0.7.3
)
,
libodsstream-
dev
(
>= 0.7.3
)
,
qtbase5-dev,
libqcustomplot-dev,
libqt5xmlpatterns5-dev
...
...
@@ -35,7 +35,7 @@ Depends: ${shlibs:Depends},
libqt5core5a,
libqt5concurrent5,
libpappsomspp0
(
= @LIBPAPPSOMSPP_VERSION@
)
,
libodsstream-
qt5-
0
(
>= 0.7.3
)
libodsstream-0
(
>= 0.7.3
)
Replaces:
masschroq
(
<< 1.5.0
)
Conflicts:
masschroq
(
<< 1.5.0
)
Suggests: masschroq, masschroq-gui, masschroq-studio
...
...
src/CMakeLists.txt
View file @
38e91487
...
...
@@ -222,13 +222,9 @@ target_link_libraries(masschroq_main ${MASSCHROQ_LIB_NAME}
PappsoMSpp::Core
PappsoMSpp::Widget
OdsStream::Core
${
Boost_chrono_LIBRARY
}
${
Boost_filesystem_LIBRARY
}
${
Boost_iostreams_LIBRARY
}
${
Boost_program_options_LIBRARY
}
${
Boost_serialization_LIBRARY
}
${
Boost_system_LIBRARY
}
${
Boost_thread_LIBRARY
}
Boost::thread
Boost::filesystem
Boost::iostreams
Qt5::Core
)
set_target_properties
(
masschroq_main PROPERTIES OUTPUT_NAME masschroq
)
...
...
@@ -247,13 +243,9 @@ else (NOGUI)
Qt5::Core
Qt5::Gui
Qt5::Widgets
${
Boost_chrono_LIBRARY
}
${
Boost_filesystem_LIBRARY
}
${
Boost_iostreams_LIBRARY
}
${
Boost_program_options_LIBRARY
}
${
Boost_serialization_LIBRARY
}
${
Boost_system_LIBRARY
}
${
Boost_thread_LIBRARY
}
Boost::thread
Boost::filesystem
Boost::iostreams
)
add_executable
(
masschroq_studio gui/parameterGui.cpp
${
STUDIO_SRCS
}
${
STUDIO_MOC_SRCS
}
)
...
...
@@ -265,14 +257,10 @@ else (NOGUI)
Qt5::Gui
Qt5::Widgets
Qt5::PrintSupport
${
QCustomPlot_LIBRARIES
}
${
Boost_chrono_LIBRARY
}
${
Boost_filesystem_LIBRARY
}
${
Boost_iostreams_LIBRARY
}
${
Boost_program_options_LIBRARY
}
${
Boost_serialization_LIBRARY
}
${
Boost_system_LIBRARY
}
${
Boost_thread_LIBRARY
}
${
QCustomPlot_LIBRARIES
}
Boost::thread
Boost::filesystem
Boost::iostreams
)
endif
(
NOGUI
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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