Add: conan support

This commit is contained in:
2021-06-03 02:54:44 +02:00
parent 0ad8735519
commit 3baf88ba0a
5 changed files with 58 additions and 19 deletions

View File

@@ -8,16 +8,24 @@ set(src_files
src/tables.hpp)
add_executable(. ${src_files})
add_executable(localTubeServer ${src_files})
target_link_libraries(.
fmt::fmt
spdlog::spdlog
SOCI::soci_core
SOCI::soci_empty
SOCI::soci_sqlite3
nlohmann_json::nlohmann_json
Boost::boost
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY})
if(USE_CONAN)
set(LIBS ${CONAN_LIBS})
else()
set(LIBS
fmt::fmt
spdlog::spdlog
SOCI::soci_core
SOCI::soci_empty
SOCI::soci_sqlite3
nlohmann_json::nlohmann_json
Boost::boost
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY})
endif()
target_link_libraries(localTubeServer ${LIBS})

View File

@@ -1,6 +1,5 @@
module Files exposing (..)
import Debug exposing (toString)
import String
import Element exposing (..)
import Element.Border as Border
import Element.Font as Font
@@ -177,7 +176,7 @@ viewFile file =
, alignBottom
, alignRight
]
{ url = String.concat [ "http://127.0.0.1/api/file/", toString file.id ]
{ url = String.concat [ "http://127.0.0.1/api/file/", String.fromInt file.id ]
, label = text "Download"
}
]