Added some travis ci target + corrected some warnings
This commit is contained in:
@@ -10,7 +10,7 @@ target_include_directories(lmsauth INTERFACE
|
||||
)
|
||||
|
||||
target_include_directories(lmsauth PRIVATE
|
||||
include/
|
||||
include
|
||||
)
|
||||
|
||||
target_link_libraries(lmsauth PRIVATE
|
||||
@@ -21,15 +21,15 @@ target_link_libraries(lmsauth PRIVATE
|
||||
target_link_libraries(lmsauth PUBLIC
|
||||
pthread
|
||||
Boost::system
|
||||
wt
|
||||
Wt::Wt
|
||||
)
|
||||
|
||||
if (PAM_FOUND)
|
||||
if (USE_PAM)
|
||||
target_compile_options(lmsauth PRIVATE "-DLMS_SUPPORT_PAM")
|
||||
target_sources(lmsauth PRIVATE impl/pam/PAM.cpp)
|
||||
target_include_directories(lmsauth PRIVATE ${PAM_INCLUDE_DIR})
|
||||
target_link_libraries(lmsauth PRIVATE ${PAM_LIBRARIES})
|
||||
endif (PAM_FOUND)
|
||||
endif (USE_PAM)
|
||||
|
||||
install(TARGETS lmsauth DESTINATION lib)
|
||||
|
||||
|
||||
@@ -37,9 +37,6 @@ namespace Auth {
|
||||
|
||||
AuthTokenService(std::size_t maxThrottlerEntries);
|
||||
|
||||
AuthTokenService() = default;
|
||||
~AuthTokenService() = default;
|
||||
|
||||
AuthTokenService(const AuthTokenService&) = delete;
|
||||
AuthTokenService& operator=(const AuthTokenService&) = delete;
|
||||
AuthTokenService(AuthTokenService&&) = delete;
|
||||
|
||||
@@ -38,9 +38,6 @@ namespace Auth {
|
||||
|
||||
PasswordService(std::size_t maxThrottlerEntries);
|
||||
|
||||
PasswordService() = default;
|
||||
~PasswordService() = default;
|
||||
|
||||
PasswordService(const PasswordService&) = delete;
|
||||
PasswordService& operator=(const PasswordService&) = delete;
|
||||
PasswordService(PasswordService&&) = delete;
|
||||
@@ -48,7 +45,7 @@ namespace Auth {
|
||||
|
||||
private:
|
||||
|
||||
bool isAuthModeSupported(Database::User::AuthMode authMode) const;
|
||||
bool isAuthModeSupported(Database::User::AuthMode authMode) const override;
|
||||
PasswordCheckResult checkUserPassword(Database::Session& session, const boost::asio::ip::address& clientAddress, const std::string& loginName, const std::string& password) override;
|
||||
Database::User::PasswordHash hashPassword(const std::string& password) const override;
|
||||
bool evaluatePasswordStrength(const std::string& loginName, const std::string& password) const override;
|
||||
|
||||
@@ -11,7 +11,7 @@ target_include_directories(lmsav INTERFACE
|
||||
)
|
||||
|
||||
target_include_directories(lmsav PRIVATE
|
||||
include/
|
||||
include
|
||||
${AVCODEC_INCLUDE_DIR}
|
||||
${AVFORMAT_INCLUDE_DIR}
|
||||
${AVUTIL_INCLUDE_DIR}
|
||||
@@ -19,10 +19,7 @@ target_include_directories(lmsav PRIVATE
|
||||
|
||||
target_link_libraries(lmsav PUBLIC
|
||||
lmsutils
|
||||
avformat
|
||||
avutil
|
||||
std::filesystem
|
||||
wt
|
||||
)
|
||||
|
||||
target_link_libraries(lmsav PRIVATE
|
||||
|
||||
@@ -28,7 +28,7 @@ if (IMAGE_LIBRARY STREQUAL STB)
|
||||
)
|
||||
target_compile_options(lmscover PRIVATE "-DLMS_SUPPORT_IMAGE_STB")
|
||||
target_include_directories(lmscover PRIVATE ${STB_INCLUDE_DIR})
|
||||
elseif (IMAGE_LIBRARY STREQUAL GraphicksMagick++)
|
||||
elseif (IMAGE_LIBRARY STREQUAL GraphicsMagick++)
|
||||
target_sources(lmscover PRIVATE
|
||||
impl/graphicsmagick/JPEGImage.cpp
|
||||
impl/graphicsmagick/RawImage.cpp
|
||||
|
||||
@@ -24,13 +24,13 @@ target_include_directories(lmsdatabase PRIVATE
|
||||
)
|
||||
|
||||
target_link_libraries(lmsdatabase PRIVATE
|
||||
wtdbosqlite3
|
||||
Wt::DboSqlite3
|
||||
)
|
||||
|
||||
target_link_libraries(lmsdatabase PUBLIC
|
||||
lmsutils
|
||||
std::filesystem
|
||||
wtdbo
|
||||
Wt::Dbo
|
||||
)
|
||||
|
||||
install(TARGETS lmsdatabase DESTINATION lib)
|
||||
|
||||
@@ -145,7 +145,7 @@ FromClause::FromClause(const std::string& clause)
|
||||
FromClause&
|
||||
FromClause::And(const FromClause& clause)
|
||||
{
|
||||
for (const std::string fromClause : clause._clause)
|
||||
for (const std::string& fromClause : clause._clause)
|
||||
{
|
||||
_clause.push_back(fromClause);
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ findFirstValueOfAs(const MetadataMap& metadataMap, std::initializer_list<std::st
|
||||
std::vector<std::string> strUuids = StringUtils::splitString(*str, "/");
|
||||
std::vector<UUID> res;
|
||||
|
||||
for (const std::string strUuid : strUuids)
|
||||
for (const std::string& strUuid : strUuids)
|
||||
{
|
||||
std::optional<UUID> uuid {UUID::fromString(strUuid)};
|
||||
if (!uuid)
|
||||
|
||||
@@ -12,6 +12,7 @@ target_include_directories(lmsrecommendation INTERFACE
|
||||
)
|
||||
|
||||
target_include_directories(lmsrecommendation PRIVATE
|
||||
impl
|
||||
include
|
||||
)
|
||||
|
||||
@@ -19,10 +20,7 @@ target_link_libraries(lmsrecommendation PRIVATE
|
||||
lmsdatabase
|
||||
lmssom
|
||||
std::filesystem
|
||||
wt
|
||||
)
|
||||
|
||||
target_include_directories(lmsrecommendation PRIVATE impl)
|
||||
|
||||
install(TARGETS lmsrecommendation DESTINATION lib)
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ target_link_libraries(lmsscanner PRIVATE
|
||||
|
||||
target_link_libraries(lmsscanner PUBLIC
|
||||
std::filesystem
|
||||
wt
|
||||
Wt::Wt
|
||||
)
|
||||
|
||||
install(TARGETS lmsscanner DESTINATION lib)
|
||||
|
||||
@@ -20,15 +20,15 @@ target_link_libraries(lmssubsonic PRIVATE
|
||||
lmsauth
|
||||
lmsav
|
||||
lmscover
|
||||
lmsdatabase
|
||||
lmsrecommendation
|
||||
lmsscanner
|
||||
lmsutils
|
||||
std::filesystem
|
||||
)
|
||||
|
||||
target_link_libraries(lmssubsonic PUBLIC
|
||||
lmsdatabase
|
||||
lmsscanner
|
||||
wt
|
||||
Wt::Wt
|
||||
)
|
||||
|
||||
install(TARGETS lmssubsonic DESTINATION lib)
|
||||
|
||||
@@ -28,7 +28,7 @@ target_link_libraries(lmsutils PRIVATE
|
||||
target_link_libraries(lmsutils PUBLIC
|
||||
Boost::system
|
||||
std::filesystem
|
||||
wt
|
||||
Wt::Wt
|
||||
)
|
||||
|
||||
install(TARGETS lmsutils DESTINATION lib)
|
||||
|
||||
@@ -35,9 +35,8 @@ namespace Zip
|
||||
class ZipHeader
|
||||
{
|
||||
public:
|
||||
constexpr ZipHeader(std::byte* buffer, SizeType bufferSize)
|
||||
constexpr ZipHeader(std::byte* buffer, SizeType)
|
||||
: _buffer {buffer}
|
||||
, _bufferSize {bufferSize}
|
||||
{}
|
||||
|
||||
enum GeneralPurposeFlag : std::uint16_t
|
||||
@@ -71,7 +70,6 @@ namespace Zip
|
||||
|
||||
private:
|
||||
std::byte* _buffer {};
|
||||
const SizeType _bufferSize {};
|
||||
};
|
||||
|
||||
void
|
||||
|
||||
@@ -49,8 +49,8 @@ target_link_libraries(lms PRIVATE
|
||||
lmsscanner
|
||||
lmssubsonic
|
||||
lmsutils
|
||||
wt
|
||||
wthttp
|
||||
Wt::Wt
|
||||
Wt::HTTP
|
||||
)
|
||||
|
||||
install(TARGETS lms DESTINATION bin)
|
||||
|
||||
Reference in New Issue
Block a user