Attachment #532300 for bug #654430

Lines 228-235 Link Here

(-)libaom-9999/CMakeLists.txt (-2 / +3 lines)
228	-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}	228	-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
229	-DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME}	229	-DCMAKE_PROJECT_NAME=${CMAKE_PROJECT_NAME}
230	-DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD}	230	-DCONFIG_MULTITHREAD=${CONFIG_MULTITHREAD}
231	-DHAVE_PTHREAD_H=${HAVE_PTHREAD_H} -P	231	-DHAVE_PTHREAD_H=${HAVE_PTHREAD_H}
232	"${AOM_ROOT}/build/cmake/pkg_config.cmake"	232	-DLIB_SUFFIX=${LIB_SUFFIX}
		233	-P "${AOM_ROOT}/build/cmake/pkg_config.cmake"
233	COMMENT "Writing aom.pc" VERBATIM)	234	COMMENT "Writing aom.pc" VERBATIM)
234	add_dependencies(aom_pc aom_version)	235	add_dependencies(aom_pc aom_version)
235	endif()	236	endif()





# Write pkg-config info.
set(prefix "${CMAKE_INSTALL_PREFIX}")
set(libdir "lib${LIB_SUFFIX}")
set(pkgconfig_file "${AOM_CONFIG_DIR}/aom.pc")
string(TOLOWER ${CMAKE_PROJECT_NAME} pkg_name)
file(WRITE "${pkgconfig_file}" "# libaom pkg-config.\n")
file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n")
file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}/bin\n")
file(APPEND "${pkgconfig_file}" "libdir=\${prefix}/${libdir}\n")
file(APPEND "${pkgconfig_file}" "includedir=\${prefix}/include\n\n")
file(APPEND "${pkgconfig_file}" "Name: ${pkg_name}\n")
file(APPEND "${pkgconfig_file}"

file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n")
file(APPEND "${pkgconfig_file}" "Requires:\n")
file(APPEND "${pkgconfig_file}" "Conflicts:\n")
file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/${libdir} -l${pkg_name} -lm\n")
if(CONFIG_MULTITHREAD AND HAVE_PTHREAD_H)
  file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")
else()

Return to bug 654430

Lines 35-46 endif () Link Here

(-)libaom-9999/build/cmake/pkg_config.cmake (-2 / +3 lines)
35		35
36	# Write pkg-config info.	36	# Write pkg-config info.
37	set(prefix "${CMAKE_INSTALL_PREFIX}")	37	set(prefix "${CMAKE_INSTALL_PREFIX}")
		38	set(libdir "lib${LIB_SUFFIX}")
38	set(pkgconfig_file "${AOM_CONFIG_DIR}/aom.pc")	39	set(pkgconfig_file "${AOM_CONFIG_DIR}/aom.pc")
39	string(TOLOWER ${CMAKE_PROJECT_NAME} pkg_name)	40	string(TOLOWER ${CMAKE_PROJECT_NAME} pkg_name)
40	file(WRITE "${pkgconfig_file}" "# libaom pkg-config.\n")	41	file(WRITE "${pkgconfig_file}" "# libaom pkg-config.\n")
41	file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n")	42	file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n")
42	file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}/bin\n")	43	file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}/bin\n")
43	file(APPEND "${pkgconfig_file}" "libdir=\${prefix}/lib\n")	44	file(APPEND "${pkgconfig_file}" "libdir=\${prefix}/${libdir}\n")
44	file(APPEND "${pkgconfig_file}" "includedir=\${prefix}/include\n\n")	45	file(APPEND "${pkgconfig_file}" "includedir=\${prefix}/include\n\n")
45	file(APPEND "${pkgconfig_file}" "Name: ${pkg_name}\n")	46	file(APPEND "${pkgconfig_file}" "Name: ${pkg_name}\n")
46	file(APPEND "${pkgconfig_file}"	47	file(APPEND "${pkgconfig_file}"
Lines 48-54 file(APPEND "${pkgconfig_file}" Link Here
48	file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n")	48	file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n")
49	file(APPEND "${pkgconfig_file}" "Requires:\n")	49	file(APPEND "${pkgconfig_file}" "Requires:\n")
50	file(APPEND "${pkgconfig_file}" "Conflicts:\n")	50	file(APPEND "${pkgconfig_file}" "Conflicts:\n")
51	file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/lib -l${pkg_name} -lm\n")	51	file(APPEND "${pkgconfig_file}" "Libs: -L\${prefix}/${libdir} -l${pkg_name} -lm\n")
52	if(CONFIG_MULTITHREAD AND HAVE_PTHREAD_H)	52	if(CONFIG_MULTITHREAD AND HAVE_PTHREAD_H)
53	file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")	53	file(APPEND "${pkgconfig_file}" "Libs.private: -lm -lpthread\n")
54	else()	54	else()