Updated library path lookup.

ggarra13 · Feb 10, 2024 · 5d4a7de · 5d4a7de
1 parent fabc3d6
commit 5d4a7de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/etc/SuperBuild/cmake/Modules/BuildFFmpeg.cmake b/etc/SuperBuild/cmake/Modules/BuildFFmpeg.cmake
@@ -21,14 +21,8 @@ else()
     endif()
     if(TLRENDER_AV1)
 	list(APPEND FFmpeg_LDFLAGS
-	    --extra-ldflags="${CMAKE_INSTALL_PREFIX}/lib/libdav1d.a")
-	if(EXISTS "/lib64" AND NOT APPLE)
-	    list(APPEND FFmpeg_LDFLAGS
-		--extra-ldflags="${CMAKE_INSTALL_PREFIX}/lib64/libSvtAv1Enc.a")
- 	else()
-	    list(APPEND FFmpeg_LDFLAGS
-		--extra-ldflags="${CMAKE_INSTALL_PREFIX}/lib/libSvtAv1Enc.a")
-	endif()
+	    --extra-ldflags="${CMAKE_INSTALL_PREFIX}/lib/libdav1d.a"
+	    --extra-ldflags="${CMAKE_INSTALL_PREFIX}/lib/libSvtAv1Enc.a")
 	if (UNIX AND NOT APPLE)
 	  list(APPEND FFmpeg_LDFLAGS
 	    --extra-libs=-lm

diff --git a/etc/SuperBuild/cmake/Modules/BuildSvtAV1.cmake b/etc/SuperBuild/cmake/Modules/BuildSvtAV1.cmake
@@ -1,11 +1,13 @@
 include(ExternalProject)
 
+include(GNUInstallDirs)
 
 set(SvtAV1_TAG v1.8.0)
 set(SvtAV1_ARGS ${TLRENDER_EXTERNAL_ARGS})
 
 list(APPEND SvtAV1_ARGS
-  -DENABLE_NASM=ON
+    -DENABLE_NASM=ON
+    -DCMAKE_INSTALL_LIBDIR=lib
     )