Group :: Development/C
RPM: libyuv
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: libyuv-alt-buildfix.patch
Download
Download
diff --git a/libyuv/CMakeLists.txt b/libyuv/CMakeLists.txt
index 5632e26..89bbefe 100644
--- a/libyuv/CMakeLists.txt
+++ b/libyuv/CMakeLists.txt
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 2.8)
+include(GNUInstallDirs)
+
# CMakeLists for libyuv
# Originally created for "roxlu build system" to compile libyuv on windows
# Run with -DTEST=ON to build unit tests
@@ -89,6 +91,13 @@ set(ly_header_files
include_directories(${ly_inc_dir})
add_library(${ly_lib_name} SHARED ${ly_source_files})
+SET_TARGET_PROPERTIES(
+ ${ly_lib_name}
+ PROPERTIES
+ VERSION 0.0.1433
+ SOVERSION 0
+)
+
add_executable(convert ${ly_base_dir}/util/convert.cc)
target_link_libraries(convert ${ly_lib_name})
@@ -97,6 +106,7 @@ include(FindJPEG)
if (JPEG_FOUND)
include_directories(${JPEG_INCLUDE_DIR})
target_link_libraries(convert ${JPEG_LIBRARY})
+ target_link_libraries(${ly_lib_name} ${JPEG_LIBRARY})
add_definitions(-DHAVE_JPEG)
endif()
@@ -126,15 +136,9 @@ if(NACL AND NACL_LIBC STREQUAL "newlib")
target_link_libraries(libyuv_unittest glibc-compat)
endif()
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix "\${prefix}")
-set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
-set(bindir "\${exec_prefix}/bin")
-set(includedir "\${prefix}/include")
-
CONFIGURE_FILE("${ly_base_dir}/libyuv.pc.in" "${ly_base_dir}/libyuv.pc" @ONLY)
-install(TARGETS ${ly_lib_name} DESTINATION lib)
+install(TARGETS ${ly_lib_name} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES ${ly_header_files} DESTINATION include/libyuv)
install(FILES ${ly_inc_dir}/libyuv.h DESTINATION include/)
INSTALL(FILES "${ly_base_dir}/libyuv.pc" DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
diff --git a/libyuv/libyuv.pc.in b/libyuv/libyuv.pc.in
index c4b4291..4070c75 100644
--- a/libyuv/libyuv.pc.in
+++ b/libyuv/libyuv.pc.in
@@ -5,7 +5,6 @@ includedir=@includedir@
Name: libyuv
Description: YUV conversion and scaling functionality library
-Version: 0.0.1280
-Cflags: -I${includedir}
-Libs: -L${libdir} -lyuv
+Version: 0.0.1433
+Libs: -lyuv
Libs.private: -ljpeg