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
ddb39319
Commit
ddb39319
authored
Dec 02, 2020
by
Filippo Rusconi
Browse files
Remove old cruft that made the package build fail.
parent
964a99ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeStuff/toolchains/unix-toolchain.cmake
View file @
ddb39319
...
...
@@ -6,11 +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
(
PappsoMSppWidget REQUIRED
)
find_package
(
QCustomPlot REQUIRED
)
src/CMakeLists.txt
View file @
ddb39319
...
...
@@ -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
...
...
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