diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f405fe..d7baae4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,27 +79,6 @@ if(NOT PIPEDAL_DISABLE_COPYRIGHT_BUILD) DESTINATION /etc/pipedal/react/var/) endif() -# Install shared libraries from submodules and FetchContent dependencies -# whose own install targets are disabled (SQLITECPP_INSTALL=OFF, LIBZIP_DO_INSTALL=OFF) -install ( - FILES - ${PROJECT_BINARY_DIR}/modules/SQLiteCpp/libSQLiteCpp.so.0 - ${PROJECT_BINARY_DIR}/modules/SQLiteCpp/sqlite3/libsqlite3.so - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib -) -install ( - FILES - ${PROJECT_BINARY_DIR}/modules/libzip/lib/libzip.so.5 - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib -) -install ( - FILES - ${PROJECT_BINARY_DIR}/_deps/ftxui-build/libftxui-component.so.5.0.0 - ${PROJECT_BINARY_DIR}/_deps/ftxui-build/libftxui-dom.so.5.0.0 - ${PROJECT_BINARY_DIR}/_deps/ftxui-build/libftxui-screen.so.5.0.0 - DESTINATION ${CMAKE_INSTALL_PREFIX}/lib -) - install ( DIRECTORY ${PROJECT_SOURCE_DIR}/src/templates DESTINATION /etc/pipedal/config/ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0a42a32..b4442f3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -207,7 +207,7 @@ add_compile_definitions(DEBIAN_ARCHITECTURE="${DEBIAN_ARCHITECTURE}") if (CMAKE_BUILD_TYPE MATCHES Debug) message(STATUS "Debug build") - # Must not -D_GLIBCXX_DEBUG, since it conflict with SQLiteCpp.lol + # Must not -D_GLIBCXX_DEBUG, since it conflict with SQLiteCpp set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -DDEBUG " ) if (USE_SANITIZE) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -static-libasan " ) @@ -412,7 +412,7 @@ target_link_libraries(libpipedald PUBLIC PiPedalCommon PRIVATE - SQLiteCpp + SQLiteCpp_static OpenSSL::Crypto ${PipeWire_LIBRARIES} )