Skip to content

Commit

Permalink
Merge pull request obsproject#248 from benklett/cmake-fixes
Browse files Browse the repository at this point in the history
Fix the cmake code for text-freetype2
  • Loading branch information
jp9000 committed Aug 19, 2014
2 parents a0897b0 + f2723aa commit 7eee45f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions plugins/text-freetype2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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})
Expand All @@ -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)

0 comments on commit 7eee45f

Please sign in to comment.