Use the right variable for choosing system vs local exiv2.

The configure file uses the label using_system_libexiv2, while a number of the test.pro files use some variation on this name. This never mattered before because everything had to use the local exiv2. Now that some builds are using the local exiv2 and others are using the system exiv2, this needs to be corrected.
MythTV · Mar 22, 2024 · 8183a6a · 8183a6a
1 parent 7e77106
commit 8183a6a
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/mythtv/external/external.pro b/mythtv/external/external.pro
@@ -6,7 +6,7 @@ win32-msvc* {
 
 # Libraries without dependencies
 
-!using_system_exiv2: SUBDIRS += libexiv2
+!using_system_libexiv2: SUBDIRS += libexiv2
 !using_system_libbluray: SUBDIRS += libmythbluray
 SUBDIRS += libmythdvdnav
 !using_system_libudfread: SUBDIRS += libudfread

diff --git a/mythtv/libs/libmythmetadata/test/test_lyrics/test_lyrics.pro b/mythtv/libs/libmythmetadata/test/test_lyrics/test_lyrics.pro
@@ -29,7 +29,7 @@ LIBS += -L../../../../external/FFmpeg/libpostproc -lmythpostproc
 LIBS += -L../.. -lmythmetadata-$$LIBVERSION
 
 
-using_system_exiv2 {
+using_system_libexiv2 {
 LIBS += -lexiv2
 } else {
 LIBS += -L../../../../external/libexiv2 -lmythexiv2-0.28

diff --git a/mythtv/libs/libmythmetadata/test/test_metadatagrabber/test_metadatagrabber.pro b/mythtv/libs/libmythmetadata/test/test_metadatagrabber/test_metadatagrabber.pro
@@ -27,7 +27,7 @@ LIBS += -L../../../../external/FFmpeg/libpostproc -lmythpostproc
 LIBS += -L../.. -lmythmetadata-$$LIBVERSION
 
 
-using_system_exiv2 {
+using_system_libexiv2 {
 LIBS += -lexiv2
 } else {
 LIBS += -L../../../../external/libexiv2 -lmythexiv2-0.28

diff --git a/mythtv/libs/libmythmetadata/test/test_musicmetadata/test_musicmetadata.pro b/mythtv/libs/libmythmetadata/test/test_musicmetadata/test_musicmetadata.pro
@@ -27,7 +27,7 @@ LIBS += -L../../../../external/FFmpeg/libpostproc -lmythpostproc
 LIBS += -L../.. -lmythmetadata-$$LIBVERSION
 
 
-using_system_exiv2 {
+using_system_libexiv2 {
 LIBS += -lexiv2
 } else {
 LIBS += -L../../../../external/libexiv2 -lmythexiv2-0.28

diff --git a/mythtv/libs/libmythmetadata/test/test_musicutils/test_musicutils.pro b/mythtv/libs/libmythmetadata/test/test_musicutils/test_musicutils.pro
@@ -27,7 +27,7 @@ LIBS += -L../../../../external/FFmpeg/libpostproc -lmythpostproc
 LIBS += -L../.. -lmythmetadata-$$LIBVERSION
 
 
-using_system_exiv2 {
+using_system_libexiv2 {
 LIBS += -lexiv2
 } else {
 LIBS += -L../../../../external/libexiv2 -lmythexiv2-0.28

diff --git a/mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.pro b/mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.pro
@@ -41,7 +41,7 @@ QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythservicecontracts
 QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythtv
 QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../libmythfreemheg
 
-!using_system_libexiv {
+!using_system_libexiv2 {
     LIBS += -L../../../../external/libexiv2 -lmythexiv2-0.28
     QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/libexiv2 -lexpat
     freebsd: LIBS += -lprocstat -liconv

diff --git a/mythtv/programs/mythbackend/test/test_recordingextender/test_recordingextender.pro b/mythtv/programs/mythbackend/test/test_recordingextender/test_recordingextender.pro
@@ -47,7 +47,7 @@ QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/FFmpeg/libpostproc
 QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/FFmpeg/libswresample
 QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../
 
-!using_system_libexiv {
+!using_system_libexiv2 {
     LIBS += -L../../../../external/libexiv2 -lmythexiv2-0.28
     QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/libexiv2 -lexpat
     freebsd: LIBS += -lprocstat -liconv

diff --git a/mythtv/programs/mythfrontend/test/test_videolist/test_videolist.pro b/mythtv/programs/mythfrontend/test/test_videolist/test_videolist.pro
@@ -48,7 +48,7 @@ QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/FFmpeg/libpostproc
 QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/FFmpeg/libswresample
 QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../
 
-!using_system_libexiv {
+!using_system_libexiv2 {
     LIBS += -L../../../../external/libexiv2 -lmythexiv2-0.28
     QMAKE_LFLAGS += -Wl,$$_RPATH_$(PWD)/../../../../external/libexiv2 -lexpat
     freebsd: LIBS += -lprocstat -liconv