summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Becker <jeff@i2p.rocks>2020-05-09 10:54:46 -0400
committerJeff Becker <jeff@i2p.rocks>2020-05-09 10:54:46 -0400
commit761a62257b53e9b314bdaa31cce9d464222ffe7a (patch)
tree4d41087780e835e49c27bd9984fe4dc825ad46fd
parentb5964f0232adcded337d9c6a9e9bc407258508c5 (diff)
-rw-r--r--.gitmodules2
-rw-r--r--CMakeLists.txt16
2 files changed, 4 insertions, 14 deletions
diff --git a/.gitmodules b/.gitmodules
index 958cad5..703454d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "deps/libtorrent"]
path = deps/libtorrent
url = https://github.com/arvidn/libtorrent
- branch = v2
+ branch = RC_1_2
fetchRecurseSubmodules = true
update = checkout \ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2409ce9..68cb0a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,8 @@
cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
project(bitchand DESCRIPTION "bittorrent 2.0 based imageboard")
-set(static_runtime ON)
-set(BUILD_SHARED_LIBS OFF)
+#set(static_runtime ON)
+#set(BUILD_SHARED_LIBS OFF)
set(lt_dir ${CMAKE_CURRENT_SOURCE_DIR}/deps/libtorrent)
set(CMAKE_CXX_STANDARD_REQUIRED 17)
@@ -21,17 +21,7 @@ set(bitchan_libs torrent-rasterbar)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-find_package(Qt5Widgets REQUIRED)
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(MPV mpv)
-
add_executable(${bitchan_exe} ${bitchan_src})
-qt5_use_modules(${bitchan_exe} Widgets)
-set(bitchan_incs ${lt_dir}/include)
add_subdirectory(${lt_dir})
-target_include_directories(${bitchan_exe} PRIVATE ${bitchan_incs})
-target_include_directories(${bitchan_exe} PRIVATE ${MPV_INCLUDE_DIRS})
-target_link_libraries(${bitchan_exe} ${bitchan_libs} ${MPV_LIBRARIES})
+target_link_libraries(${bitchan_exe} PUBLIC ${bitchan_libs})