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
xtpcpp
Commits
dd4f5f5c
Commit
dd4f5f5c
authored
Dec 08, 2020
by
Langella Olivier
Browse files
get rid of zstd and alglib libraries : this is handled by PAPPSOms++ library
parent
94bb0ef7
Changes
7
Hide whitespace changes
Inline
Side-by-side
CMakeStuff/modules/FindAlglib.cmake
deleted
100644 → 0
View file @
94bb0ef7
#sudo apt install libalglib-dev
set
(
Alglib_FOUND FALSE
)
find_path
(
Alglib_INCLUDE_DIR libalglib/solvers.h
PATHS /usr/local/include /usr/include
PATH_SUFFIXES libalglib ENV PATH
)
find_library
(
Alglib_LIBRARY NAMES alglib
)
if
(
Alglib_INCLUDE_DIR AND Alglib_LIBRARY
)
mark_as_advanced
(
Alglib_INCLUDE_DIR
)
mark_as_advanced
(
Alglib_LIBRARY
)
message
(
STATUS
"~~~~~~~~~~~~~
${
_LIBRARY
}
~~~~~~~~~~~~~~~"
)
set
(
Alglib_FOUND TRUE
)
endif
()
if
(
Alglib_FOUND
)
set
(
Alglib_INCLUDE_DIRS
${
Alglib_INCLUDE_DIR
}
)
set
(
Alglib_LIBRARIES
${
Alglib_LIBRARY
}
)
if
(
NOT TARGET Alglib::Alglib
)
add_library
(
Alglib::Alglib UNKNOWN IMPORTED
)
set_target_properties
(
Alglib::Alglib PROPERTIES
IMPORTED_LOCATION
"
${
Alglib_LIBRARY
}
"
INTERFACE_INCLUDE_DIRECTORIES
"
${
Alglib_INCLUDE_DIR
}
"
)
endif
()
else
()
if
(
Alglib_FIND_REQUIRED
)
message
(
FATAL_ERROR
"Could not find Alglib_LIBRARY. Please do specify the
Alglib_INCLUDE_DIRS and Alglib_LIBRARIES variables using cmake!"
)
endif
()
endif
()
CMakeStuff/modules/FindPwiz.cmake
deleted
100644 → 0
View file @
94bb0ef7
# Copyright : ETH Zurich
# License : three-clause BSD license
# Authors : Witold Wolski
# for full text refer to files: LICENSE, AUTHORS and COPYRIGHT
#FIND_PATH(Pwiz_INCLUDE_DIR pwiz/Version.hpp)
FIND_PATH
(
Pwiz_INCLUDE_DIR pwiz/Version.hpp
PATHS /usr/local/include /usr/include
PATH_SUFFIXES proteowizard pwiz libpwiz ENV PATH
)
FIND_LIBRARY
(
Pwiz_LIBRARY NAMES pwiz
)
IF
(
Pwiz_INCLUDE_DIR AND Pwiz_LIBRARY
)
MESSAGE
(
STATUS
"XXXXXXXXXXXXX
${
Pwiz_LIBRARY
}
XXXXXXXXXXXXXXX"
)
SET
(
Pwiz_FOUND TRUE
)
ENDIF
(
Pwiz_INCLUDE_DIR AND Pwiz_LIBRARY
)
IF
(
Pwiz_FOUND
)
# show which CppUnit was found only if not quiet
IF
(
NOT Pwiz_FIND_QUIETLY
)
MESSAGE
(
STATUS
"Found Pwiz:
${
Pwiz_LIBRARY
}
"
)
ENDIF
(
NOT Pwiz_FIND_QUIETLY
)
if
(
NOT TARGET Pwiz::Pwiz
)
add_library
(
Pwiz::Pwiz UNKNOWN IMPORTED
)
set_target_properties
(
Pwiz::Pwiz PROPERTIES
IMPORTED_LOCATION
"
${
Pwiz_LIBRARY
}
"
INTERFACE_INCLUDE_DIRECTORIES
"
${
Pwiz_INCLUDE_DIR
}
"
)
endif
()
ELSE
(
Pwiz_FOUND
)
# fatal error if CppUnit is required but not found
IF
(
Pwiz_FIND_REQUIRED
)
MESSAGE
(
FATAL_ERROR
"Could not find Pwiz please do specify the Pwiz_INCLUDE_DIR and the Pwiz_LIBRARY variables using ccmake!"
)
ENDIF
(
Pwiz_FIND_REQUIRED
)
ENDIF
(
Pwiz_FOUND
)
CMakeStuff/modules/FindZstd.cmake
deleted
100644 → 0
View file @
94bb0ef7
#sudo apt install libzstd-dev
set
(
Zstd_FOUND FALSE
)
find_path
(
Zstd_INCLUDE_DIR zstd.h
PATHS /usr/local/include /usr/include
PATH_SUFFIXES libzstd ENV PATH
)
find_library
(
Zstd_LIBRARY NAMES zstd
)
if
(
Zstd_INCLUDE_DIR AND Zstd_LIBRARY
)
mark_as_advanced
(
Zstd_INCLUDE_DIR
)
mark_as_advanced
(
Zstd_LIBRARY
)
message
(
STATUS
"~~~~~~~~~~~~~
${
_LIBRARY
}
~~~~~~~~~~~~~~~"
)
set
(
Zstd_FOUND TRUE
)
endif
()
if
(
Zstd_FOUND
)
set
(
Zstd_INCLUDE_DIRS
${
Zstd_INCLUDE_DIR
}
)
set
(
Zstd_LIBRARIES
${
Zstd_LIBRARY
}
)
if
(
NOT TARGET Zstd::Zstd
)
add_library
(
Zstd::Zstd UNKNOWN IMPORTED
)
set_target_properties
(
Zstd::Zstd PROPERTIES
IMPORTED_LOCATION
"
${
Zstd_LIBRARY
}
"
INTERFACE_INCLUDE_DIRECTORIES
"
${
Zstd_INCLUDE_DIR
}
"
)
endif
()
else
()
if
(
Zstd_FIND_REQUIRED
)
message
(
FATAL_ERROR
"Could not find Zstd_LIBRARY. Please do specify the
Zstd_INCLUDE_DIR and Zstd_LIBRARY variables using cmake!"
)
endif
()
endif
()
CMakeStuff/toolchains/unix-toolchain.cmake
View file @
dd4f5f5c
...
...
@@ -20,11 +20,4 @@ endif (NOT PappsoMSpp_FOUND)
set
(
Alglib_DIR
${
CMAKE_MODULE_PATH
}
)
find_package
(
Alglib REQUIRED
)
find_package
(
ZLIB REQUIRED
)
set
(
Zstd_DIR
${
CMAKE_MODULE_PATH
}
)
find_package
(
Zstd REQUIRED
)
debian/control
View file @
dd4f5f5c
...
...
@@ -10,8 +10,6 @@ Build-Depends: debhelper-compat (= 12),
libpappsomspp-dev (>= 0.8.11),
libpappsomspp-widget-dev (>= 0.8.11),
libodsstream-dev,
libalglib-dev,
libzstd-dev (>= 1.3.3),
libqt5svg5-dev,
libqcustomplot-dev,
docbook-to-man,
...
...
debian/control.cmake
View file @
dd4f5f5c
...
...
@@ -10,8 +10,6 @@ Build-Depends: debhelper-compat (= 12),
libpappsomspp-
dev
(
>= @LIBPAPPSOMSPP_VERSION@
)
,
libpappsomspp-widget-
dev
(
>= @LIBPAPPSOMSPP_VERSION@
)
,
libodsstream-dev,
libalglib-dev,
libzstd-
dev
(
>= 1.3.3
)
,
libqt5svg5-dev,
libqcustomplot-dev,
docbook-to-man,
...
...
src/CMakeLists.txt
View file @
dd4f5f5c
...
...
@@ -255,8 +255,6 @@ target_link_libraries(xtpcpp
Qt5::Sql
Qt5::Concurrent
ZLIB::ZLIB
Alglib::Alglib
Zstd::Zstd
${
QCustomPlot_LIBRARIES
}
${
Quazip5_LIBRARY
}
)
...
...
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