Commit 78ef440a authored by Frank Barchard's avatar Frank Barchard Committed by Commit Bot

Rename convert to yuvconvert to avoid name clash with linux util

Bug: libyuv:695
Test: untested
Change-Id: Ib088fd16fd00bbc50868ea330b2a544e29a3385c
Reviewed-on: https://chromium-review.googlesource.com/469077Reviewed-by: 's avatarHenrik Kjellander <kjellander@chromium.org>
Commit-Queue: Frank Barchard <fbarchard@google.com>
parent cbe53850
...@@ -21,7 +21,7 @@ pin-log.txt ...@@ -21,7 +21,7 @@ pin-log.txt
cmake_install.cmake cmake_install.cmake
CMakeCache.txt CMakeCache.txt
CMakeFiles/ CMakeFiles/
convert yuvconvert
libgtest.a libgtest.a
libyuv.a libyuv.a
libyuv_unittest libyuv_unittest
......
...@@ -33,7 +33,7 @@ group("default") { ...@@ -33,7 +33,7 @@ group("default") {
if (libyuv_include_tests) { if (libyuv_include_tests) {
deps += [ deps += [
":compare", ":compare",
":convert", ":yuvconvert",
":cpuid", ":cpuid",
":libyuv_unittest", ":libyuv_unittest",
":psnr", ":psnr",
...@@ -297,10 +297,10 @@ if (libyuv_include_tests) { ...@@ -297,10 +297,10 @@ if (libyuv_include_tests) {
} }
} }
executable("convert") { executable("yuvconvert") {
sources = [ sources = [
# sources # sources
"util/convert.cc", "util/yuvconvert.cc",
] ]
deps = [ deps = [
":libyuv", ":libyuv",
......
...@@ -31,14 +31,14 @@ SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}" ...@@ -31,14 +31,14 @@ SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}"
SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES PREFIX "lib" ) SET_TARGET_PROPERTIES ( ${ly_lib_shared} PROPERTIES PREFIX "lib" )
# this creates the conversion tool # this creates the conversion tool
ADD_EXECUTABLE ( convert ${ly_base_dir}/util/convert.cc ) ADD_EXECUTABLE ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc )
TARGET_LINK_LIBRARIES ( convert ${ly_lib_static} ) TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} )
INCLUDE ( FindJPEG ) INCLUDE ( FindJPEG )
if (JPEG_FOUND) if (JPEG_FOUND)
include_directories( ${JPEG_INCLUDE_DIR} ) include_directories( ${JPEG_INCLUDE_DIR} )
target_link_libraries( convert ${JPEG_LIBRARY} ) target_link_libraries( yuvconvert ${JPEG_LIBRARY} )
add_definitions( -DHAVE_JPEG ) add_definitions( -DHAVE_JPEG )
endif() endif()
...@@ -73,7 +73,7 @@ endif() ...@@ -73,7 +73,7 @@ endif()
# install the conversion tool, .so, .a, and all the header files # install the conversion tool, .so, .a, and all the header files
INSTALL ( PROGRAMS ${CMAKE_BINARY_DIR}/convert DESTINATION bin RENAME yuvconvert ) INSTALL ( PROGRAMS ${CMAKE_BINARY_DIR}/yuvconvert DESTINATION bin )
INSTALL ( TARGETS ${ly_lib_static} DESTINATION lib ) INSTALL ( TARGETS ${ly_lib_static} DESTINATION lib )
INSTALL ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION lib ) INSTALL ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION lib )
INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include ) INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include )
......
...@@ -238,7 +238,7 @@ If you get a compile error for atlthunk.lib on Windows, read http://www.chromium ...@@ -238,7 +238,7 @@ If you get a compile error for atlthunk.lib on Windows, read http://www.chromium
ninja -C out/Debug libyuv ninja -C out/Debug libyuv
ninja -C out/Debug libyuv_unittest ninja -C out/Debug libyuv_unittest
ninja -C out/Debug compare ninja -C out/Debug compare
ninja -C out/Debug convert ninja -C out/Debug yuvconvert
ninja -C out/Debug psnr ninja -C out/Debug psnr
ninja -C out/Debug cpuid ninja -C out/Debug cpuid
......
...@@ -123,14 +123,14 @@ ...@@ -123,14 +123,14 @@
], # conditions ], # conditions
}, },
{ {
'target_name': 'convert', 'target_name': 'yuvconvert',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'libyuv.gyp:libyuv', 'libyuv.gyp:libyuv',
], ],
'sources': [ 'sources': [
# sources # sources
'util/convert.cc', 'util/yuvconvert.cc',
], ],
'conditions': [ 'conditions': [
['OS=="linux"', { ['OS=="linux"', {
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
// Convert an ARGB image to YUV. // Convert an ARGB image to YUV.
// Usage: convert src_argb.raw dst_yuv.raw // Usage: yuvconvert src_argb.raw dst_yuv.raw
#ifndef _CRT_SECURE_NO_WARNINGS #ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment