jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix FindIconv naming consistency

Browse Source
This commit is contained in:
BtbN
2014-08-21 02:06:39 +02:00
parent ffe74f5903
commit 997b4f9161
2 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/text-freetype2/CMakeLists.txt
View File

@@ -7,9 +7,9 @@ if(NOT LIBFREETYPE_FOUND)
endif()
if(APPLE)
find_package(iconv QUIET)
if(NOT LIBICONV_FOUND)
message(STATUS "IConv library not found, Freetype text plugin disabled")
find_package(Iconv QUIET)
if(NOT ICONV_FOUND)
message(STATUS "Iconv library not found, Freetype text plugin disabled")
return()
endif()
@@ -20,11 +20,11 @@ if(APPLE)
find-font-iconv.c)
include_directories(${COCOA}
${LIBICONV_INCLUDE_DIRS})
${ICONV_INCLUDE_DIRS})
set(text-freetype2_PLATFORM_DEPS
${COCOA}
${LIBICONV_LIBRARIES})
${ICONV_LIBRARIES})
set_source_files_properties(find-font-cocoa.m
PROPERTIES LANGUAGE C)
@@ -35,16 +35,16 @@ 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)
if(NOT LIBICONV_FOUND)
message(STATUS "IConv library not found, Freetype text plugin disabled")
find_package(Iconv QUIET)
if(NOT ICONV_FOUND)
message(STATUS "Iconv library not found, Freetype text plugin disabled")
return()
endif()
set(text-freetype2_PLATFORM_SOURCES
find-font-iconv.c)
include_directories(${LIBICONV_INCLUDE_DIR})
include_directories(${ICONV_INCLUDE_DIR})
endif()
include_directories(${LIBFREETYPE_INCLUDE_DIRS})
@@ -66,8 +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})
if(UNIX AND ICONV_FOUND)
target_link_libraries(text-freetype2 ${ICONV_LIBRARIES})
endif()
install_obs_plugin_with_data(text-freetype2 data)