Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c16ba209a9 | ||
|
|
79e2668652 | ||
|
|
c1830c1411 | ||
|
|
d296e689ee | ||
|
|
c6789fc33b | ||
|
|
26f541be0d | ||
|
|
de5207d1e3 |
@@ -11,6 +11,7 @@ BBFILE_PATTERN_meta-qt5-extra := "^${LAYERDIR}/"
|
||||
BBFILE_PRIORITY_meta-qt5-extra = "20"
|
||||
|
||||
LAYERDEPENDS_meta-qt5-extra = "core qt5-layer openembedded-layer networking-layer multimedia-layer"
|
||||
LAYERSERIES_COMPAT_meta-qt5-extra = "rocko"
|
||||
|
||||
LICENSE_PATH += "${LAYERDIR}/files/licenses"
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@ auth required pam_env.so
|
||||
auth required pam_tally.so file=/var/log/faillog onerr=succeed
|
||||
auth required pam_shells.so
|
||||
auth required pam_nologin.so
|
||||
auth required pam_permit.so
|
||||
-auth optional pam_gnome_keyring.so
|
||||
|
||||
account include common-account
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 99021226c538d2742f92c45fc7eeb2520791cd09 Mon Sep 17 00:00:00 2001
|
||||
From 5b95fca0be36e0e57f65975cf5b295e1937bbbf4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 2 Aug 2017 21:08:36 +0200
|
||||
Subject: [PATCH] Align Makefile
|
||||
@@ -9,6 +9,7 @@ Content-Transfer-Encoding: 8bit
|
||||
* don't hardcode g++
|
||||
* make ldconfig work on installed directory only
|
||||
* use pkgconfig to find freetype2
|
||||
* do not add host path to compiler/linker
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
@@ -16,7 +17,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 2b29cbf..6c721b6 100644
|
||||
index 2b29cbf..0811df9 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -31,8 +31,8 @@ MINVERS = 9.0
|
||||
@@ -25,8 +26,8 @@ index 2b29cbf..6c721b6 100644
|
||||
|
||||
-CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2
|
||||
-LDFLAGS += -L/usr/X11R6/$(LIBDIR) `freetype-config --libs`
|
||||
+CPPFLAGS += -Wall -I. -I/usr/X11R6/include `pkg-config --cflags freetype2` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2
|
||||
+LDFLAGS += -L/usr/X11R6/$(LIBDIR) `pkg-config --libs freetype2`
|
||||
+CPPFLAGS += -Wall -I. `pkg-config --cflags freetype2` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2
|
||||
+LDFLAGS += `pkg-config --libs freetype2`
|
||||
LDLIBS +=
|
||||
|
||||
|
||||
@@ -48,5 +49,5 @@ index 2b29cbf..6c721b6 100644
|
||||
|
||||
|
||||
--
|
||||
2.9.4
|
||||
2.14.3
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 87f2f214f0bbe5b84f2687bb9b47e26e3150d5e2 Mon Sep 17 00:00:00 2001
|
||||
From 23dd312b270330a0df18b229b9f68bc74c72934b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 2 Aug 2017 17:34:18 +0200
|
||||
Subject: [PATCH] Align Makefiles
|
||||
@@ -9,28 +9,32 @@ Content-Transfer-Encoding: 8bit
|
||||
* don't hardcode g++
|
||||
* remove -march=native from CXXFLAGS
|
||||
* make ldconfig work on installed directory only
|
||||
* do not add host path to link flags
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
apps/Makefile | 5 ++---
|
||||
apps/Makefile | 6 ++----
|
||||
libs/Makefile | 5 ++---
|
||||
2 files changed, 4 insertions(+), 6 deletions(-)
|
||||
2 files changed, 4 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/apps/Makefile b/apps/Makefile
|
||||
index f009937..abbdeb5 100644
|
||||
index f009937..9329b25 100644
|
||||
--- a/apps/Makefile
|
||||
+++ b/apps/Makefile
|
||||
@@ -27,7 +27,6 @@ MANDIR = /usr/share/man/man1
|
||||
LDFLAGS += -L$(PREFIX)/$(LIBDIR)
|
||||
@@ -24,10 +24,8 @@ LIBDIR = lib$(SUFFIX)
|
||||
DISTDIR = zresample-$(VERSION)
|
||||
VERSION = 1.6.0
|
||||
MANDIR = /usr/share/man/man1
|
||||
-LDFLAGS += -L$(PREFIX)/$(LIBDIR)
|
||||
CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
|
||||
CXXFLAGS += -O3 -ffast-math -Wall
|
||||
-CXXFLAGS += -march=native
|
||||
|
||||
|
||||
all: zresample zretune zresample.1.gz zretune.1.gz
|
||||
@@ -36,7 +35,7 @@ all: zresample zretune zresample.1.gz zretune.1.gz
|
||||
@@ -36,7 +34,7 @@ all: zresample zretune zresample.1.gz zretune.1.gz
|
||||
ZRESAMPLE_O = zresample.o audiofile.o dither.o
|
||||
zresample: LDLIBS += -lzita-resampler -lsndfile -lrt
|
||||
zresample: $(ZRESAMPLE_O)
|
||||
@@ -39,7 +43,7 @@ index f009937..abbdeb5 100644
|
||||
$(ZRESAMPLE_O):
|
||||
-include $(ZRESAMPLE_O:%.o=%.d)
|
||||
|
||||
@@ -44,7 +43,7 @@ $(ZRESAMPLE_O):
|
||||
@@ -44,7 +42,7 @@ $(ZRESAMPLE_O):
|
||||
ZRETUNE_O = zretune.o audiofile.o dither.o
|
||||
zretune: LDLIBS += -lzita-resampler -lsndfile -lrt
|
||||
zretune: $(ZRETUNE_O)
|
||||
@@ -79,5 +83,5 @@ index 15b0471..575e670 100644
|
||||
uninstall:
|
||||
/bin/rm -rf $(DESTDIR)$(PREFIX)/include/zita-resampler
|
||||
--
|
||||
2.9.4
|
||||
2.14.3
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From f3cbe95449fd6346933179f13d9ce23216a148fc Mon Sep 17 00:00:00 2001
|
||||
From 43251e9b177f5256825deaffe136230ca3c0378a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sun, 18 Sep 2016 22:14:59 +0200
|
||||
Subject: [PATCH] do not pin build flags - use defaults
|
||||
Subject: [PATCH 1/2] do not pin build flags - use defaults
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
@@ -9,12 +9,13 @@ Content-Transfer-Encoding: 8bit
|
||||
Upstream-Status: Inappropriate [cross-specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: wata2ki <wata2ki@gmail.com>
|
||||
---
|
||||
src/makefile | 14 +++++---------
|
||||
1 file changed, 5 insertions(+), 9 deletions(-)
|
||||
src/makefile | 16 +++++-----------
|
||||
1 file changed, 5 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/makefile b/src/makefile
|
||||
index 886237f..ace5266 100644
|
||||
index 886237f..1764da7 100644
|
||||
--- a/src/makefile
|
||||
+++ b/src/makefile
|
||||
@@ -15,8 +15,6 @@ INSTALL_BINARY_DIR = /usr/bin/
|
||||
@@ -35,41 +36,42 @@ index 886237f..ace5266 100644
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
@@ -35,11 +31,11 @@ CPP = c++
|
||||
@@ -34,12 +30,10 @@ CPP = c++
|
||||
#
|
||||
|
||||
../plugins/%.so: plugins/%.c ladspa.h
|
||||
$(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
|
||||
- $(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
|
||||
- $(LD) -o ../plugins/$*.so plugins/$*.o -shared
|
||||
+ $(LD) -o ../plugins/$*.so plugins/$*.o -shared $(LDLDFLAGS)
|
||||
+ $(CC) $(CFLAGS) -o ../plugins/$*.so plugins/$*.c -shared $(LDFLAGS)
|
||||
|
||||
../plugins/%.so: plugins/%.cpp ladspa.h
|
||||
$(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
|
||||
- $(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
|
||||
- $(CPP) -o ../plugins/$*.so plugins/$*.o -shared
|
||||
+ $(CPP) -o ../plugins/$*.so plugins/$*.o -shared $(LDFLAGS)
|
||||
+ $(CXX) $(CFLAGS) -o ../plugins/$*.so plugins/$*.cpp -shared $(LDFLAGS)
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
@@ -90,17 +86,17 @@ targets: $(PLUGINS) $(PROGRAMS)
|
||||
@@ -90,17 +84,17 @@ targets: $(PLUGINS) $(PROGRAMS)
|
||||
#
|
||||
|
||||
../bin/applyplugin: applyplugin.o load.o default.o
|
||||
- $(CC) $(CFLAGS) $(LIBRARIES) \
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -ldl \
|
||||
+ $(CC) $(CFLAGS) -ldl $(LDFLAGS) \
|
||||
-o ../bin/applyplugin \
|
||||
applyplugin.o load.o default.o
|
||||
|
||||
../bin/analyseplugin: analyseplugin.o load.o default.o
|
||||
- $(CC) $(CFLAGS) $(LIBRARIES) \
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -ldl -lm \
|
||||
+ $(CC) $(CFLAGS) -ldl -lm $(LDFLAGS) \
|
||||
-o ../bin/analyseplugin \
|
||||
analyseplugin.o load.o default.o
|
||||
|
||||
../bin/listplugins: listplugins.o search.o
|
||||
- $(CC) $(CFLAGS) $(LIBRARIES) \
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -ldl \
|
||||
+ $(CC) $(CFLAGS) -ldl $(LDFLAGS) \
|
||||
-o ../bin/listplugins \
|
||||
listplugins.o search.o
|
||||
|
||||
--
|
||||
2.5.5
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
From 2fdcfa6361ac0d897552c39e362424da9f0e2423 Mon Sep 17 00:00:00 2001
|
||||
From: wata2ki <wata2ki@gmail.com>
|
||||
Date: Sat, 12 May 2018 20:49:12 +0900
|
||||
Subject: [PATCH 2/2] Fix _init and _fini multiple definition
|
||||
|
||||
When linking using CC, the following error occurs.
|
||||
|
||||
/tmp/ccpy2KWL.o: In function `_init':
|
||||
ladspa_sdk/src/plugins/noise.c:146: multiple definition of `_init'
|
||||
sysdeps/arm/crti.S:83: first defined here
|
||||
/tmp/ccpy2KWL.o: In function `_fini':
|
||||
ladspa_sdk/src/plugins/noise.c:223: multiple definition of `_fini'
|
||||
sysdeps/arm/crti.S:95: first defined here
|
||||
collect2: error: ld returned 1 exit status
|
||||
makefile:33: recipe for target '../plugins/noise.so' failed
|
||||
make: *** [../plugins/noise.so] Error 1
|
||||
|
||||
Because these plugins are using deprecated _init and _fini instead of __attribute__ ((constructor)) and __attribute__ ((destructor)).
|
||||
This patch is modified to use __attribute__ ((constructor)) and __attribute__ ((destructor)).
|
||||
|
||||
Signed-off-by: wata2ki <wata2ki@gmail.com>
|
||||
---
|
||||
src/plugins/amp.c | 8 ++++----
|
||||
src/plugins/delay.c | 8 ++++----
|
||||
src/plugins/filter.c | 8 ++++----
|
||||
src/plugins/noise.c | 8 ++++----
|
||||
4 files changed, 16 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/amp.c b/src/plugins/amp.c
|
||||
index b6d2345..f80b3e3 100644
|
||||
--- a/src/plugins/amp.c
|
||||
+++ b/src/plugins/amp.c
|
||||
@@ -152,8 +152,8 @@ LADSPA_Descriptor * g_psStereoDescriptor = NULL;
|
||||
|
||||
/* _init() is called automatically when the plugin library is first
|
||||
loaded. */
|
||||
-void
|
||||
-_init() {
|
||||
+void __attribute__ ((constructor))
|
||||
+local_init() {
|
||||
|
||||
char ** pcPortNames;
|
||||
LADSPA_PortDescriptor * piPortDescriptors;
|
||||
@@ -335,8 +335,8 @@ deleteDescriptor(LADSPA_Descriptor * psDescriptor) {
|
||||
/*****************************************************************************/
|
||||
|
||||
/* _fini() is called automatically when the library is unloaded. */
|
||||
-void
|
||||
-_fini() {
|
||||
+void __attribute__ ((destructor))
|
||||
+local_fini() {
|
||||
deleteDescriptor(g_psMonoDescriptor);
|
||||
deleteDescriptor(g_psStereoDescriptor);
|
||||
}
|
||||
diff --git a/src/plugins/delay.c b/src/plugins/delay.c
|
||||
index 8b03979..7b15966 100644
|
||||
--- a/src/plugins/delay.c
|
||||
+++ b/src/plugins/delay.c
|
||||
@@ -228,8 +228,8 @@ LADSPA_Descriptor * g_psDescriptor = NULL;
|
||||
|
||||
/* _init() is called automatically when the plugin library is first
|
||||
loaded. */
|
||||
-void
|
||||
-_init() {
|
||||
+void __attribute__ ((constructor))
|
||||
+local_init() {
|
||||
|
||||
char ** pcPortNames;
|
||||
LADSPA_PortDescriptor * piPortDescriptors;
|
||||
@@ -322,8 +322,8 @@ _init() {
|
||||
/*****************************************************************************/
|
||||
|
||||
/* _fini() is called automatically when the library is unloaded. */
|
||||
-void
|
||||
-_fini() {
|
||||
+void __attribute__ ((destructor))
|
||||
+local_fini() {
|
||||
long lIndex;
|
||||
if (g_psDescriptor) {
|
||||
free((char *)g_psDescriptor->Label);
|
||||
diff --git a/src/plugins/filter.c b/src/plugins/filter.c
|
||||
index 3f50457..aa53a4f 100644
|
||||
--- a/src/plugins/filter.c
|
||||
+++ b/src/plugins/filter.c
|
||||
@@ -252,8 +252,8 @@ LADSPA_Descriptor * g_psHPFDescriptor = NULL;
|
||||
|
||||
/* _init() is called automatically when the plugin library is first
|
||||
loaded. */
|
||||
-void
|
||||
-_init() {
|
||||
+void __attribute__ ((constructor))
|
||||
+local_init() {
|
||||
|
||||
char ** pcPortNames;
|
||||
LADSPA_PortDescriptor * piPortDescriptors;
|
||||
@@ -431,8 +431,8 @@ deleteDescriptor(LADSPA_Descriptor * psDescriptor) {
|
||||
/*****************************************************************************/
|
||||
|
||||
/* _fini() is called automatically when the library is unloaded. */
|
||||
-void
|
||||
-_fini() {
|
||||
+void __attribute__ ((destructor))
|
||||
+local_fini() {
|
||||
deleteDescriptor(g_psLPFDescriptor);
|
||||
deleteDescriptor(g_psHPFDescriptor);
|
||||
}
|
||||
diff --git a/src/plugins/noise.c b/src/plugins/noise.c
|
||||
index 0fdd938..f602055 100644
|
||||
--- a/src/plugins/noise.c
|
||||
+++ b/src/plugins/noise.c
|
||||
@@ -142,8 +142,8 @@ LADSPA_Descriptor * g_psDescriptor;
|
||||
|
||||
/* _init() is called automatically when the plugin library is first
|
||||
loaded. */
|
||||
-void
|
||||
-_init() {
|
||||
+void __attribute__ ((constructor))
|
||||
+local_init() {
|
||||
|
||||
char ** pcPortNames;
|
||||
LADSPA_PortDescriptor * piPortDescriptors;
|
||||
@@ -219,8 +219,8 @@ _init() {
|
||||
/*****************************************************************************/
|
||||
|
||||
/* _fini() is called automatically when the library is unloaded. */
|
||||
-void
|
||||
-_fini() {
|
||||
+void __attribute__ ((destructor))
|
||||
+local_fini() {
|
||||
long lIndex;
|
||||
if (g_psDescriptor) {
|
||||
free((char *)g_psDescriptor->Label);
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -2,15 +2,14 @@ SUMMARY = "Linux Audio Developer's Simple Plug-in API, examples and tools"
|
||||
LICENSE = "LGPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=6fd75d9d2ba6776dcdc4d5257eeab3dd"
|
||||
|
||||
#inherit autotools pkgconfig perlnative
|
||||
|
||||
DEPENDS += " \
|
||||
fftw \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
http://slackware.uk/slacky/slackware-13.0/multimedia/ladspa/${PV}/src/ladspa_sdk_${PV}.tgz \
|
||||
file://0001-do-not-pin-flags-for-native.patch \
|
||||
file://0001-do-not-pin-build-flags-use-defaults.patch \
|
||||
file://0002-Fix-_init-and-_fini-multiple-definition.patch \
|
||||
file://0002-Use-fallback-for-plugindir-in-case-env.-var-LADSPA_P.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "671be3e1021d0722cadc7fb27054628e"
|
||||
@@ -22,8 +21,6 @@ CFLAGS += "-I. -fPIC"
|
||||
CXXFLAGS += "-I. -fPIC"
|
||||
|
||||
do_compile() {
|
||||
# ld does not accept -Wl -> remove (see patch)
|
||||
export LDLDFLAGS=`echo ${LDFLAGS} | sed s:-Wl,::g`
|
||||
cd ${S}/src
|
||||
oe_runmake targets
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@ DEPENDS = "zlib expat"
|
||||
|
||||
SRC_URI = " \
|
||||
http://www.exiv2.org/builds/${BPN}-${PV}-trunk.tar.gz \
|
||||
file://0001-CMakeLists.txt-do-not-find-system-thread-library-it-.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "5399e3b570d7f9205f0e76d47582da4c"
|
||||
SRC_URI[sha256sum] = "c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb"
|
||||
@@ -17,6 +16,8 @@ S = "${WORKDIR}/${BPN}-trunk"
|
||||
|
||||
INSANE_SKIP_${PN} = "useless-rpaths"
|
||||
|
||||
EXTRA_OECMAKE_append = " -DTHREADS_PTHREAD_ARG=OFF "
|
||||
|
||||
do_install_preend() {
|
||||
install -d ${D}${mandir}
|
||||
}
|
||||
|
||||
@@ -1,91 +0,0 @@
|
||||
From e631ca78f9041e3a35298f933101323dff76cbbb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 23 Aug 2017 22:11:08 +0200
|
||||
Subject: [PATCH] CMakeLists.txt: do not us cmake thread library find - it has
|
||||
TRY_RUN in it
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross-specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
CMakeLists.txt | 1 -
|
||||
samples/CMakeLists.txt | 10 +++++-----
|
||||
src/CMakeLists.txt | 4 ++--
|
||||
3 files changed, 7 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7034bb6..64604c6 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -120,7 +120,6 @@ IF( EXIV2_ENABLE_XMP )
|
||||
IF (NOT MINGW)
|
||||
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||
ENDIF()
|
||||
- find_package(Threads REQUIRED)
|
||||
ENDIF( EXIV2_ENABLE_XMP )
|
||||
|
||||
INCLUDE( config/CMakeChecks.txt )
|
||||
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
|
||||
index 9690aa0..80c96be 100644
|
||||
--- a/samples/CMakeLists.txt
|
||||
+++ b/samples/CMakeLists.txt
|
||||
@@ -48,7 +48,7 @@ FOREACH(entry ${SAMPLES})
|
||||
STRING( REPLACE ".cpp" "" target ${entry})
|
||||
ADD_EXECUTABLE( ${target} ${target}.cpp )
|
||||
ADD_TEST( ${target}_test ${target} )
|
||||
- TARGET_LINK_LIBRARIES( ${target} ${PRIVATE_VAR} exiv2lib Threads::Threads ${EXPAT_LIBRARIES})
|
||||
+ TARGET_LINK_LIBRARIES( ${target} ${PRIVATE_VAR} exiv2lib ${EXPAT_LIBRARIES})
|
||||
INSTALL( TARGETS ${target} ${INSTALL_TARGET_STANDARD_ARGS} )
|
||||
ENDFOREACH(entry ${SAMPLES})
|
||||
|
||||
@@ -61,25 +61,25 @@ ENDIF( MSVC )
|
||||
|
||||
SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp )
|
||||
ADD_EXECUTABLE( metacopy ${MC_SRC} )
|
||||
-TARGET_LINK_LIBRARIES( metacopy ${PRIVATE_VAR} exiv2lib Threads::Threads ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
+TARGET_LINK_LIBRARIES( metacopy ${PRIVATE_VAR} exiv2lib ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
INSTALL( TARGETS metacopy ${INSTALL_TARGET_STANDARD_ARGS} )
|
||||
|
||||
SET ( PATHTEST_SRC ${PATHTEST_SRC} path-test.cpp ../src/utils.cpp )
|
||||
ADD_EXECUTABLE ( pathtest ${PATHTEST_SRC} )
|
||||
SET_TARGET_PROPERTIES( pathtest PROPERTIES OUTPUT_NAME path-test )
|
||||
-TARGET_LINK_LIBRARIES( pathtest ${PRIVATE_VAR} exiv2lib Threads::Threads ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
+TARGET_LINK_LIBRARIES( pathtest ${PRIVATE_VAR} exiv2lib ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
INSTALL ( TARGETS pathtest ${INSTALL_TARGET_STANDARD_ARGS} )
|
||||
|
||||
SET( EXIV2JSON_SRC exiv2json.cpp Jzon.cpp )
|
||||
ADD_EXECUTABLE( exiv2json ${EXIV2JSON_SRC} )
|
||||
SET_TARGET_PROPERTIES( exiv2json PROPERTIES OUTPUT_NAME exiv2json )
|
||||
-TARGET_LINK_LIBRARIES( exiv2json ${PRIVATE_VAR} ${PRIVATE_VAR} exiv2lib Threads::Threads ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
+TARGET_LINK_LIBRARIES( exiv2json ${PRIVATE_VAR} ${PRIVATE_VAR} exiv2lib ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
INSTALL( TARGETS exiv2json ${INSTALL_TARGET_STANDARD_ARGS} )
|
||||
|
||||
SET( GEOTAG_SRC geotag.cpp )
|
||||
ADD_EXECUTABLE( geotag ${GEOTAG_SRC} )
|
||||
SET_TARGET_PROPERTIES( geotag PROPERTIES OUTPUT_NAME geotag )
|
||||
-TARGET_LINK_LIBRARIES( geotag ${PRIVATE_VAR} exiv2lib Threads::Threads ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
+TARGET_LINK_LIBRARIES( geotag ${PRIVATE_VAR} exiv2lib ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
INSTALL( TARGETS geotag ${INSTALL_TARGET_STANDARD_ARGS} )
|
||||
|
||||
# ******************************************************************************
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index aecd621..8563894 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -280,8 +280,8 @@ if( EXIV2_ENABLE_LIBXMP )
|
||||
if ( MSVC )
|
||||
LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH}/$(ConfigurationName))
|
||||
else()
|
||||
- ADD_DEPENDENCIES( exiv2lib xmp Threads::Threads)
|
||||
- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} Threads::Threads)
|
||||
+ ADD_DEPENDENCIES( exiv2lib xmp )
|
||||
+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} )
|
||||
endif(MSVC)
|
||||
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} xmp )
|
||||
ENDIF()
|
||||
--
|
||||
2.9.4
|
||||
|
||||
Reference in New Issue
Block a user