commit 971dcdd9420be218e03ba2e7c68402a56bed1282
author Christopher Degawa <christopher.degawa@intel.com> Thu Jun 24 21:44:39 2021 -0500
committer Wan-Teh Chang <wtc@google.com> Tue Sep 28 00:39:19 2021 +0000
tree 6ace609a7bb249971ffb9b056a79e0855e4a1834
parent 0ce275f3159821b7903ef237c3beda9991da1d83

aom_install: use relpath for install

install() will automatically prepend CMAKE_INSTALL_PREFIX to relative
paths

Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
Change-Id: I528054281cf736de7b80d934d1512ba84d5db16a
(cherry picked from commit 15decc81c76b2135b2fc51469851252e46cb4953)

build/cmake/aom_install.cmake

diff --git a/build/cmake/aom_install.cmake b/build/cmake/aom_install.cmake
index 46b5a59..8d3e098 100644
--- a/build/cmake/aom_install.cmake
+++ b/build/cmake/aom_install.cmake
@@ -81,21 +81,15 @@
       set(AOM_INSTALL_LIBS aom)
     endif()
 
-    # Setup the install rules.
-    install(
-      FILES ${AOM_INSTALL_INCS}
-      DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/aom")
-    install(
-      FILES "${AOM_PKG_CONFIG_FILE}"
-      DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-    install(
-      TARGETS ${AOM_INSTALL_LIBS} DESTINATION
-              "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
-      RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
-
-    if(ENABLE_EXAMPLES)
-      install(TARGETS ${AOM_INSTALL_BINS} DESTINATION
-                      "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
-    endif()
+    # Setup the install rules. install() will automatically prepend
+    # CMAKE_INSTALL_PREFIX to relative paths
+    install(FILES ${AOM_INSTALL_INCS}
+            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aom")
+    install(FILES "${AOM_PKG_CONFIG_FILE}"
+            DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+    install(TARGETS ${AOM_INSTALL_LIBS};${AOM_INSTALL_BINS}
+            RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+            LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+            ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
   endif()
 endmacro()