vendor: CMakeLists: Fix cmake pthread use

Let cmake use -pthread instead of -lpthread, to fix build error on RISC-V.
nmeum · Jan 6, 2022 · 8d839f8 · 8d839f8
1 parent adfa152
commit 8d839f8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/vendor/CMakeLists.adb.txt b/vendor/CMakeLists.adb.txt
@@ -191,7 +191,7 @@ target_link_libraries(adb
 	brotlidec
 	brotlienc
 	lz4
-	pthread
+	Threads::Threads
 	usb-1.0
 	z
 	zstd)
diff --git a/vendor/CMakeLists.fastboot.txt b/vendor/CMakeLists.fastboot.txt
@@ -135,4 +135,4 @@ target_compile_definitions(fastboot PRIVATE
 target_link_libraries(fastboot
 	libsparse libzip libcutils liblog libfsmgr libutil
 	libbase libext4 libselinux libsepol libdiagnoseusb crypto
-	z pcre2-8 pthread dl)
+	z pcre2-8 Threads::Threads dl)
diff --git a/vendor/CMakeLists.mke2fs.txt b/vendor/CMakeLists.mke2fs.txt
@@ -113,6 +113,6 @@ add_executable("${ANDROID_MKE2FS_NAME}"
 	e2fsprogs/misc/util.c)
 
 target_link_libraries("${ANDROID_MKE2FS_NAME}"
-	libext2fs libsparse libbase libzip liblog libutil pthread z)
+	libext2fs libsparse libbase libzip liblog libutil Threads::Threads z)
 target_include_directories("${ANDROID_MKE2FS_NAME}" PRIVATE
 	e2fsprogs/lib)
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
@@ -36,7 +36,11 @@ endif()
 
 add_subdirectory(boringssl EXCLUDE_FROM_ALL)
 add_subdirectory(fmtlib EXCLUDE_FROM_ALL)
+
 find_package(Protobuf REQUIRED)
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+
 include_directories(${PROTOBUF_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})