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
da27128f
Commit
da27128f
authored
Dec 02, 2020
by
Filippo Rusconi
Browse files
New upstream version 2.2.23
parent
0e55ee6b
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeStuff/toolchains/unix-toolchain.cmake
View file @
da27128f
...
...
@@ -6,26 +6,14 @@ set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES /usr/include)
set
(
CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES /usr/include
)
if
(
NOT OdsStream_FOUND
)
find_package
(
OdsStream REQUIRED
)
endif
(
NOT OdsStream_FOUND
)
find_package
(
OdsStream REQUIRED
)
if
(
NOT PappsoMSpp_FOUND
)
find_package
(
PappsoMSpp REQUIRED
)
endif
(
NOT PappsoMSpp_FOUND
)
find_package
(
PappsoMSpp REQUIRED
)
#find_package( Boost COMPONENTS iostreams thread filesystem chrono REQUIRED )
find_package
(
Boost COMPONENTS thread filesystem iostreams REQUIRED
)
find_package
(
PappsoMSppWidget REQUIRED
)
set
(
Alglib_DIR
${
CMAKE_MODULE_PATH
}
)
find_package
(
Alglib REQUIRED
)
find_package
(
ZLIB REQUIRED
)
set
(
Zstd_DIR
${
CMAKE_MODULE_PATH
}
)
find_package
(
Zstd REQUIRED
)
find_package
(
QCustomPlot REQUIRED
)
src/CMakeLists.txt
View file @
da27128f
...
...
@@ -9,17 +9,13 @@ find_package( Qt5 COMPONENTS Core Gui Xml XmlPatterns Widgets Concurrent PrintSu
set
(
CMAKE_MODULE_PATH
${
CMAKE_SOURCE_DIR
}
/modules
)
#if (RocksDB_FOUND)
#else (RocksDB_FOUND)
# FIND_PACKAGE( RocksDB REQUIRED )
#endif (RocksDB_FOUND)
if
(
QCustomPlot_FOUND
)
else
(
QCustomPlot_FOUND
)
find_package
(
QCustomPlot REQUIRED
)
endif
(
QCustomPlot_FOUND
)
if
(
OdsStream_FOUND
)
else
(
OdsStream_FOUND
)
find_package
(
OdsStream REQUIRED
)
#ODSSTREAM_INCLUDE_DIR AND ODSSTREAM_LIBRARY
...
...
@@ -28,25 +24,23 @@ endif (OdsStream_FOUND)
#sudo apt-get install libpappsomspp-dev
if
(
PappsoMSpp_FOUND
)
else
(
PappsoMSpp_FOUND
)
if
(
PappsoMSpp_FOUND
)
else
(
PappsoMSpp_FOUND
)
message
(
"looking for PAPPSOms++ library"
)
find_package
(
PappsoMSpp REQUIRED
)
endif
(
PappsoMSpp_FOUND
)
endif
(
PappsoMSpp_FOUND
)
if
(
PappsoMSpp_FOUND
)
else
(
PappsoMSpp_FOUND
)
if
(
PappsoMSpp_FOUND
)
else
(
PappsoMSpp_FOUND
)
message
(
"PAPPSOms++ library not found"
)
message
(
"did you apt-get install libpappsomspp-dev ?"
)
endif
(
PappsoMSpp_FOUND
)
endif
(
PappsoMSpp_FOUND
)
if
(
PappsoMSppWidget_FOUND
)
else
(
PappsoMSppWidget_FOUND
)
if
(
PappsoMSppWidget_FOUND
)
else
(
PappsoMSppWidget_FOUND
)
message
(
"PAPPSOms++ widget library not found"
)
message
(
"did you apt-get install libpappsomspp-widget-dev ?"
)
endif
(
PappsoMSppWidget_FOUND
)
endif
(
PappsoMSppWidget_FOUND
)
set
(
GUI_UIS
...
...
@@ -222,9 +216,6 @@ target_link_libraries(masschroq_main ${MASSCHROQ_LIB_NAME}
PappsoMSpp::Core
PappsoMSpp::Widget
OdsStream::Core
Boost::thread
Boost::filesystem
Boost::iostreams
Qt5::Core
)
set_target_properties
(
masschroq_main PROPERTIES OUTPUT_NAME masschroq
)
...
...
@@ -243,9 +234,6 @@ else (NOGUI)
Qt5::Core
Qt5::Gui
Qt5::Widgets
Boost::thread
Boost::filesystem
Boost::iostreams
)
add_executable
(
masschroq_studio gui/parameterGui.cpp
${
STUDIO_SRCS
}
${
STUDIO_MOC_SRCS
}
)
...
...
@@ -257,10 +245,7 @@ else (NOGUI)
Qt5::Gui
Qt5::Widgets
Qt5::PrintSupport
${
QCustomPlot_LIBRARIES
}
Boost::thread
Boost::filesystem
Boost::iostreams
${
QCustomPlot_LIBRARIES
}
)
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