浏览代码

Merge pull request #248 from benklett/cmake-fixes

Fix the cmake code for text-freetype2
Jim 11 年之前
父节点
当前提交
7eee45fb7f
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      plugins/text-freetype2/CMakeLists.txt

+ 4 - 2
plugins/text-freetype2/CMakeLists.txt

@@ -35,7 +35,7 @@ else()
 	message(STATUS "Linux-specific code has yet to be written for the text plugin, just needs load_os_font_list written..  which, er, may or may not be a pain.  (My apologies in advance, please don't strangle me)")
 	return()
 
-	find_package(ICONV QUIET)
+	find_package(iconv QUIET)
 	if(NOT LIBICONV_FOUND)
 		message(STATUS "IConv library not found, Freetype text plugin disabled")
 		return()
@@ -45,7 +45,6 @@ else()
 		find-font-iconv.c)
 
 	include_directories(${LIBICONV_INCLUDE_DIR})
-	target_link_libraries(${LIBICONV_LIBRARIES})
 endif()
 
 include_directories(${LIBFREETYPE_INCLUDE_DIRS})
@@ -67,6 +66,9 @@ target_link_libraries(text-freetype2
 	libobs
 	${text-freetype2_PLATFORM_DEPS}
 	${LIBFREETYPE_LIBRARIES})
+if(UNIX AND LIBICONV_FOUND)
+	target_link_libraries(text-freetype2 ${LIBICONV_LIBRARIES})
+endif()
 
 install_obs_plugin(text-freetype2)
 install_obs_plugin_data(text-freetype2 data)