Explorar o código

cmake: Install 'libobs.pc' under the correct 'libdir'

In 'libobs/CMakeLists.txt', use '${CMAKE_INSTALL_LIBDIR}' instead of
'${CMAKE_INSTALL_PREFIX}/lib', as the latter results into 'libobs.pc'
being installed under '/lib' when '/lib64' would be more appropriate.

In 'libobs/libobs.pc.in', use '@CMAKE_INSTALL_FULL_LIBDIR@' for
'libdir', '@CMAKE_INSTALL_FULL_INCLUDEDIR@' for 'includedir',
and '@CMAKE_INSTALL_PREFIX@' for 'prefix'.

Gentoo-Bug: https://bugs.gentoo.org/644538
Jimi Huotari %!s(int64=6) %!d(string=hai) anos
pai
achega
ab67b39257
Modificáronse 2 ficheiros con 4 adicións e 4 borrados
  1. 1 1
      libobs/CMakeLists.txt
  2. 3 3
      libobs/libobs.pc.in

+ 1 - 1
libobs/CMakeLists.txt

@@ -454,7 +454,7 @@ if(UNIX AND NOT APPLE)
 		set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
 		set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
 	endforeach()
 	endforeach()
 	CONFIGURE_FILE("libobs.pc.in" "libobs.pc" @ONLY)
 	CONFIGURE_FILE("libobs.pc.in" "libobs.pc" @ONLY)
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 endif()
 endif()
 
 
 set_target_properties(libobs PROPERTIES
 set_target_properties(libobs PROPERTIES

+ 3 - 3
libobs/libobs.pc.in

@@ -1,7 +1,7 @@
-prefix=@DEST_DIR@
+prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 exec_prefix=${prefix}
-libdir=${prefix}/@OBS_LIBRARY_DESTINATION@
-includedir=${prefix}/include
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 
 
 Name: libobs
 Name: libobs
 Description: OBS Studio Library
 Description: OBS Studio Library