Merge branch 'stkw0-develop' into develop

CMakeLists.txt

@@ -10,11 +10,16 @@ if (UNIX)
 	set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
 endif ()
 
-include(CTest)
+option(ENABLE_TESTS "Enable tests" ON)
+
+if(ENABLE_TESTS)
+	include(CTest)
+	find_package(GTest REQUIRED)
+endif()
+
 find_package(PkgConfig REQUIRED)
 find_package(Threads REQUIRED)
 find_package(Filesystem REQUIRED)
-find_package(GTest REQUIRED)
 find_package(Boost REQUIRED COMPONENTS system program_options)
 find_package(Wt REQUIRED COMPONENTS Wt Dbo DboSqlite3 HTTP)
 pkg_check_modules(Taglib REQUIRED IMPORTED_TARGET taglib)

src/libs/av/CMakeLists.txt

@@ -26,5 +26,5 @@ target_link_libraries(lmsav PRIVATE
 	PkgConfig::LIBAV
 	)
 
-install(TARGETS lmsav DESTINATION lib)
+install(TARGETS lmsav DESTINATION ${CMAKE_INSTALL_LIBDIR})
 

src/libs/database/CMakeLists.txt

@@ -42,7 +42,7 @@ target_link_libraries(lmsdatabase PUBLIC
 	Wt::Dbo
 	)
 
-install(TARGETS lmsdatabase DESTINATION lib)
+install(TARGETS lmsdatabase DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 if(BUILD_TESTING)
 	add_subdirectory(test)

src/libs/image/CMakeLists.txt

@@ -34,5 +34,5 @@ else ()
 	message(FATAL_ERROR "Invalid IMAGE_LIBRARY provided")
 endif()
 
-install(TARGETS lmsimage DESTINATION lib)
+install(TARGETS lmsimage DESTINATION ${CMAKE_INSTALL_LIBDIR})
 

src/libs/metadata/CMakeLists.txt

@@ -28,5 +28,5 @@ target_link_libraries(lmsmetadata PUBLIC
 	std::filesystem
 	)
 
-install(TARGETS lmsmetadata DESTINATION lib)
+install(TARGETS lmsmetadata DESTINATION ${CMAKE_INSTALL_LIBDIR})
 

src/libs/services/auth/CMakeLists.txt

@@ -35,5 +35,5 @@ if (USE_PAM)
 	target_link_libraries(lmsauth PRIVATE ${PAM_LIBRARIES})
 endif (USE_PAM)
 
-install(TARGETS lmsauth DESTINATION lib)
+install(TARGETS lmsauth DESTINATION ${CMAKE_INSTALL_LIBDIR})
 

src/libs/services/cover/CMakeLists.txt

@@ -24,5 +24,5 @@ target_link_libraries(lmsservice-cover PUBLIC
 	std::filesystem
 	)
 
-install(TARGETS lmsservice-cover DESTINATION lib)
+install(TARGETS lmsservice-cover DESTINATION ${CMAKE_INSTALL_LIBDIR})
 

src/libs/services/feedback/CMakeLists.txt

@@ -26,4 +26,4 @@ target_link_libraries(lmsfeedback PUBLIC
 	lmsdatabase
 	)
 
-install(TARGETS lmsfeedback DESTINATION lib)
+install(TARGETS lmsfeedback DESTINATION ${CMAKE_INSTALL_LIBDIR})

src/libs/services/recommendation/CMakeLists.txt

@@ -26,5 +26,5 @@ target_link_libraries(lmsrecommendation PRIVATE
 	std::filesystem
 	)
 
-install(TARGETS lmsrecommendation DESTINATION lib)
+install(TARGETS lmsrecommendation DESTINATION ${CMAKE_INSTALL_LIBDIR})
 

src/libs/services/scanner/CMakeLists.txt

@@ -29,5 +29,5 @@ target_link_libraries(lmsscanner PUBLIC
 	Wt::Wt
 	)
 
-install(TARGETS lmsscanner DESTINATION lib)
+install(TARGETS lmsscanner DESTINATION ${CMAKE_INSTALL_LIBDIR})
 

src/libs/services/scrobbling/CMakeLists.txt

@@ -26,7 +26,7 @@ target_link_libraries(lmsscrobbling PUBLIC
 	lmsdatabase
 	)
 
-install(TARGETS lmsscrobbling DESTINATION lib)
+install(TARGETS lmsscrobbling DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 if(BUILD_TESTING)
 	add_subdirectory(test)

src/libs/som/CMakeLists.txt

@@ -17,7 +17,7 @@ target_link_libraries(lmssom PUBLIC
 
 set_property(TARGET lmssom PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-install(TARGETS lmssom DESTINATION lib)
+install(TARGETS lmssom DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 if(BUILD_TESTING)
 	add_subdirectory(test)

src/libs/subsonic/CMakeLists.txt

@@ -56,5 +56,5 @@ target_link_libraries(lmssubsonic PUBLIC
 	Wt::Wt
 	)
 
-install(TARGETS lmssubsonic DESTINATION lib)
+install(TARGETS lmssubsonic DESTINATION ${CMAKE_INSTALL_LIBDIR})
 

src/libs/utils/CMakeLists.txt

@@ -38,7 +38,7 @@ target_link_libraries(lmsutils PUBLIC
 	Wt::Wt
 	)
 
-install(TARGETS lmsutils DESTINATION lib)
+install(TARGETS lmsutils DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 if(BUILD_TESTING)
 	add_subdirectory(test)