| OLD | NEW | 
|---|
| 1 cmake_minimum_required(VERSION 2.8) | 1 cmake_minimum_required(VERSION 2.8) | 
| 2 | 2 | 
| 3 # CMakeLists for libyuv | 3 # CMakeLists for libyuv | 
| 4 # Originally created for "roxlu build system" to compile libyuv on windows | 4 # Originally created for "roxlu build system" to compile libyuv on windows | 
| 5 # Run with -DTEST=ON to build unit tests | 5 # Run with -DTEST=ON to build unit tests | 
| 6 option(TEST "Built unit tests" OFF) | 6 option(TEST "Built unit tests" OFF) | 
| 7 | 7 | 
| 8 set(ly_base_dir ${CMAKE_CURRENT_LIST_DIR}) | 8 set(ly_base_dir ${CMAKE_CURRENT_LIST_DIR}) | 
| 9 set(ly_src_dir ${ly_base_dir}/source/) | 9 set(ly_src_dir ${ly_base_dir}/source/) | 
| 10 set(ly_inc_dir ${ly_base_dir}/include) | 10 set(ly_inc_dir ${ly_base_dir}/include) | 
| 11 set(ly_lib_name "yuv") | 11 set(ly_lib_name "yuv") | 
| 12 | 12 | 
| 13 set(ly_source_files | 13 set(ly_source_files | 
| 14   ${ly_src_dir}/compare.cc | 14   ${ly_src_dir}/compare.cc | 
| 15   ${ly_src_dir}/compare_common.cc | 15   ${ly_src_dir}/compare_common.cc | 
| 16   ${ly_src_dir}/compare_neon.cc | 16   ${ly_src_dir}/compare_neon.cc | 
|  | 17   ${ly_src_dir}/compare_neon64.cc | 
| 17   ${ly_src_dir}/compare_gcc.cc | 18   ${ly_src_dir}/compare_gcc.cc | 
| 18   ${ly_src_dir}/compare_win.cc | 19   ${ly_src_dir}/compare_win.cc | 
| 19   ${ly_src_dir}/convert.cc | 20   ${ly_src_dir}/convert.cc | 
| 20   ${ly_src_dir}/convert_argb.cc | 21   ${ly_src_dir}/convert_argb.cc | 
| 21   ${ly_src_dir}/convert_from.cc | 22   ${ly_src_dir}/convert_from.cc | 
| 22   ${ly_src_dir}/convert_from_argb.cc | 23   ${ly_src_dir}/convert_from_argb.cc | 
| 23   ${ly_src_dir}/convert_jpeg.cc | 24   ${ly_src_dir}/convert_jpeg.cc | 
| 24   ${ly_src_dir}/convert_to_argb.cc | 25   ${ly_src_dir}/convert_to_argb.cc | 
| 25   ${ly_src_dir}/convert_to_i420.cc | 26   ${ly_src_dir}/convert_to_i420.cc | 
| 26   ${ly_src_dir}/cpu_id.cc | 27   ${ly_src_dir}/cpu_id.cc | 
| 27   ${ly_src_dir}/mjpeg_decoder.cc | 28   ${ly_src_dir}/mjpeg_decoder.cc | 
| 28   ${ly_src_dir}/mjpeg_validate.cc | 29   ${ly_src_dir}/mjpeg_validate.cc | 
| 29   ${ly_src_dir}/planar_functions.cc | 30   ${ly_src_dir}/planar_functions.cc | 
| 30   ${ly_src_dir}/rotate.cc | 31   ${ly_src_dir}/rotate.cc | 
| 31   ${ly_src_dir}/rotate_any.cc | 32   ${ly_src_dir}/rotate_any.cc | 
| 32   ${ly_src_dir}/rotate_argb.cc | 33   ${ly_src_dir}/rotate_argb.cc | 
| 33   ${ly_src_dir}/rotate_common.cc | 34   ${ly_src_dir}/rotate_common.cc | 
| 34   ${ly_src_dir}/rotate_mips.cc | 35   ${ly_src_dir}/rotate_mips.cc | 
| 35   ${ly_src_dir}/rotate_neon.cc | 36   ${ly_src_dir}/rotate_neon.cc | 
|  | 37   ${ly_src_dir}/rotate_neon64.cc | 
| 36   ${ly_src_dir}/rotate_gcc.cc | 38   ${ly_src_dir}/rotate_gcc.cc | 
| 37   ${ly_src_dir}/rotate_win.cc | 39   ${ly_src_dir}/rotate_win.cc | 
| 38   ${ly_src_dir}/row_any.cc | 40   ${ly_src_dir}/row_any.cc | 
| 39   ${ly_src_dir}/row_common.cc | 41   ${ly_src_dir}/row_common.cc | 
| 40   ${ly_src_dir}/row_mips.cc | 42   ${ly_src_dir}/row_mips.cc | 
| 41   ${ly_src_dir}/row_neon.cc | 43   ${ly_src_dir}/row_neon.cc | 
|  | 44   ${ly_src_dir}/row_neon64.cc | 
| 42   ${ly_src_dir}/row_gcc.cc | 45   ${ly_src_dir}/row_gcc.cc | 
| 43   ${ly_src_dir}/row_win.cc | 46   ${ly_src_dir}/row_win.cc | 
| 44   ${ly_src_dir}/scale.cc | 47   ${ly_src_dir}/scale.cc | 
| 45   ${ly_src_dir}/scale_any.cc | 48   ${ly_src_dir}/scale_any.cc | 
| 46   ${ly_src_dir}/scale_argb.cc | 49   ${ly_src_dir}/scale_argb.cc | 
| 47   ${ly_src_dir}/scale_common.cc | 50   ${ly_src_dir}/scale_common.cc | 
| 48   ${ly_src_dir}/scale_mips.cc | 51   ${ly_src_dir}/scale_mips.cc | 
| 49   ${ly_src_dir}/scale_neon.cc | 52   ${ly_src_dir}/scale_neon.cc | 
|  | 53   ${ly_src_dir}/scale_neon64.cc | 
| 50   ${ly_src_dir}/scale_gcc.cc | 54   ${ly_src_dir}/scale_gcc.cc | 
| 51   ${ly_src_dir}/scale_win.cc | 55   ${ly_src_dir}/scale_win.cc | 
| 52   ${ly_src_dir}/video_common.cc | 56   ${ly_src_dir}/video_common.cc | 
| 53 ) | 57 ) | 
| 54 | 58 | 
| 55 set(ly_unittest_sources | 59 set(ly_unittest_sources | 
| 56   ${ly_base_dir}/unit_test/basictypes_test.cc | 60   ${ly_base_dir}/unit_test/basictypes_test.cc | 
| 57   ${ly_base_dir}/unit_test/color_test.cc | 61   ${ly_base_dir}/unit_test/color_test.cc | 
| 58   ${ly_base_dir}/unit_test/compare_test.cc | 62   ${ly_base_dir}/unit_test/compare_test.cc | 
| 59   ${ly_base_dir}/unit_test/convert_test.cc | 63   ${ly_base_dir}/unit_test/convert_test.cc | 
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 127   endif() | 131   endif() | 
| 128 endif() | 132 endif() | 
| 129 | 133 | 
| 130 if(NACL AND NACL_LIBC STREQUAL "newlib") | 134 if(NACL AND NACL_LIBC STREQUAL "newlib") | 
| 131   target_link_libraries(libyuv_unittest glibc-compat) | 135   target_link_libraries(libyuv_unittest glibc-compat) | 
| 132 endif() | 136 endif() | 
| 133 | 137 | 
| 134 install(TARGETS ${ly_lib_name} DESTINATION lib) | 138 install(TARGETS ${ly_lib_name} DESTINATION lib) | 
| 135 install(FILES ${ly_header_files} DESTINATION include/libyuv) | 139 install(FILES ${ly_header_files} DESTINATION include/libyuv) | 
| 136 install(FILES ${ly_inc_dir}/libyuv.h DESTINATION include/) | 140 install(FILES ${ly_inc_dir}/libyuv.h DESTINATION include/) | 
| OLD | NEW | 
|---|