coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-07 01:06:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

cmake move libyuv_unittest target into the if(TEST) condition

Browse Source 
BUG=libyuv:579
TESTED=mkdir build && cd build && cmake .. && cmake --build . --config Release
R=kjellander@chromium.org

Review URL: https://codereview.chromium.org/1847233002 .
This commit is contained in:
Frank Barchard 2016-04-01 16:15:34 -07:00
parent 5065743a11
commit ef79a9938b
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -128,13 +128,14 @@ if(TEST)
if (JPEG_FOUND) if (JPEG_FOUND)
target_link_libraries(libyuv_unittest ${JPEG_LIBRARY}) target_link_libraries(libyuv_unittest ${JPEG_LIBRARY})
endif() endif()
endif()
if(NACL AND NACL_LIBC STREQUAL "newlib") if(NACL AND NACL_LIBC STREQUAL "newlib")
target_link_libraries(libyuv_unittest glibc-compat) target_link_libraries(libyuv_unittest glibc-compat)
endif() endif()
target_link_libraries(libyuv_unittest gflags) target_link_libraries(libyuv_unittest gflags)
endif()
install(TARGETS ${ly_lib_name} DESTINATION lib) install(TARGETS ${ly_lib_name} DESTINATION lib)
install(FILES ${ly_header_files} DESTINATION include/libyuv) install(FILES ${ly_header_files} DESTINATION include/libyuv)

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 1580 Version: 1581
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1580 #define LIBYUV_VERSION 1581
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT