1 files changed, 18 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13fb6d7..aa7e4b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt

@@ -1,28 +1,36 @@
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required (VERSION 3.27)
 project (sap)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
-find_package(FFMPEG REQUIRED)
+IF (NOT FFMPEG_FOUND)
+  find_package(FFMPEG)
+ENDIF()
 find_package(PkgConfig)
 pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
 pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED)
+set(RAWR_ONLY_LIBRARY TRUE)
 add_subdirectory(vendor/rawr-ebooks EXCLUDE_FROM_ALL)
-add_subdirectory(vendor/mastodonpp)
+set(LIBOAUTHCPP_BUILD_DEMOS FALSE)
+add_subdirectory(vendor/liboauthcpp/build EXCLUDE_FROM_ALL)
+include_directories(vendor/liboauthcpp/include)
 include_directories(
  ${FFMPEG_INCLUDE_DIRS}
  vendor/rawr-ebooks
-  vendor/mastodonpp/include
+  vendor/liboauthcpp/include
+  ${CURL_INCLUDE_DIRS}
  vendor/json
  ${yaml-cpp_INCLUDE_DIRS}
  ${GraphicsMagick_INCLUDE_DIRS})
 link_directories(
  ${yaml-cpp_LIBRARY_DIRS}
-  ${GraphicsMagick_LIBRARY_DIRS})
+  ${GraphicsMagick_LIBRARY_DIRS}
+  ${FFMPEG_LIBRARY_DIRS})
 add_executable(sap sap.cpp director.cpp designer.cpp main.cpp)
 set_property(TARGET sap PROPERTY CXX_STANDARD 17)
@@ -30,7 +38,10 @@ set_property(TARGET sap PROPERTY CXX_STANDARD_REQUIRED ON)
 target_link_libraries(sap
  rawr
-  mastodonpp
+  curl
-  ${FFMPEG_LIBRARIES}
+  oauthcpp
+  avcodec
+  swscale
+  avformat
  ${GraphicsMagick_LIBRARIES}
  ${yaml-cpp_LIBRARIES})

diff --git a/CMakeLists.txt b/CMakeLists.txt index 13fb6d7..aa7e4b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1,28 +1,36 @@
1	cmake_minimum_required (VERSION 3.1)	1	cmake_minimum_required (VERSION 3.27)
2	project (sap)	2	project (sap)
3		3
4	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")	4	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
5		5
6	find_package(FFMPEG REQUIRED)	6	IF (NOT FFMPEG_FOUND)
		7	find_package(FFMPEG)
		8	ENDIF()
7		9
8	find_package(PkgConfig)	10	find_package(PkgConfig)
9	pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)	11	pkg_check_modules(yaml-cpp yaml-cpp REQUIRED)
10	pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED)	12	pkg_check_modules(GraphicsMagick GraphicsMagick++ REQUIRED)
11		13
		14	set(RAWR_ONLY_LIBRARY TRUE)
12	add_subdirectory(vendor/rawr-ebooks EXCLUDE_FROM_ALL)	15	add_subdirectory(vendor/rawr-ebooks EXCLUDE_FROM_ALL)
13	add_subdirectory(vendor/mastodonpp)	16
		17	set(LIBOAUTHCPP_BUILD_DEMOS FALSE)
		18	add_subdirectory(vendor/liboauthcpp/build EXCLUDE_FROM_ALL)
		19	include_directories(vendor/liboauthcpp/include)
14		20
15	include_directories(	21	include_directories(
16	${FFMPEG_INCLUDE_DIRS}	22	${FFMPEG_INCLUDE_DIRS}
17	vendor/rawr-ebooks	23	vendor/rawr-ebooks
18	vendor/mastodonpp/include	24	vendor/liboauthcpp/include
		25	${CURL_INCLUDE_DIRS}
19	vendor/json	26	vendor/json
20	${yaml-cpp_INCLUDE_DIRS}	27	${yaml-cpp_INCLUDE_DIRS}
21	${GraphicsMagick_INCLUDE_DIRS})	28	${GraphicsMagick_INCLUDE_DIRS})
22		29
23	link_directories(	30	link_directories(
24	${yaml-cpp_LIBRARY_DIRS}	31	${yaml-cpp_LIBRARY_DIRS}
25	${GraphicsMagick_LIBRARY_DIRS})	32	${GraphicsMagick_LIBRARY_DIRS}
		33	${FFMPEG_LIBRARY_DIRS})
26		34
27	add_executable(sap sap.cpp director.cpp designer.cpp main.cpp)	35	add_executable(sap sap.cpp director.cpp designer.cpp main.cpp)
28	set_property(TARGET sap PROPERTY CXX_STANDARD 17)	36	set_property(TARGET sap PROPERTY CXX_STANDARD 17)
@@ -30,7 +38,10 @@ set_property(TARGET sap PROPERTY CXX_STANDARD_REQUIRED ON)
30		38
31	target_link_libraries(sap	39	target_link_libraries(sap
32	rawr	40	rawr
33	mastodonpp	41	curl
34	${FFMPEG_LIBRARIES}	42	oauthcpp
		43	avcodec
		44	swscale
		45	avformat
35	${GraphicsMagick_LIBRARIES}	46	${GraphicsMagick_LIBRARIES}
36	${yaml-cpp_LIBRARIES})	47	${yaml-cpp_LIBRARIES})