[SCM] libcoverart/master: Imported Upstream version 1.0.0+git20150706
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Mon Jul 6 19:45:51 UTC 2015
The following commit has been merged in the master branch:
commit 464ff35cfa04588b3fa7bf0f0882104653a75aa1
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Mon Jul 6 20:32:25 2015 +0200
Imported Upstream version 1.0.0+git20150706
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b70f841..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-CMakeCache.txt
-CMakeFiles/
-Doxyfile
-Makefile
-cmake_install.cmake
-config.h
-libcoverart.pc
-docs
-install_manifest.txt
-ImportExecutables.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a65d616..dfd1fc2 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ SET(PROJECT_VERSION 1.0.0)
# 2. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
# 3. If any interfaces have been added since the last public release, then increment age.
# 4. If any interfaces have been removed since the last public release, then set age to 0.
-SET(coverart_SOVERSION_CURRENT 0)
-SET(coverart_SOVERSION_REVISION 1)
+SET(coverart_SOVERSION_CURRENT 1)
+SET(coverart_SOVERSION_REVISION 0)
SET(coverart_SOVERSION_AGE 0)
MATH(EXPR coverart_SOVERSION_MAJOR "${coverart_SOVERSION_CURRENT} - ${coverart_SOVERSION_AGE}")
@@ -18,6 +18,17 @@ MATH(EXPR coverart_SOVERSION_PATCH "${coverart_SOVERSION_REVISION}")
SET(coverart_VERSION ${coverart_SOVERSION_MAJOR}.${coverart_SOVERSION_MINOR}.${coverart_SOVERSION_PATCH})
SET(coverart_SOVERSION ${coverart_SOVERSION_MAJOR})
+SET(coverartc_SOVERSION_CURRENT 1)
+SET(coverartc_SOVERSION_REVISION 0)
+SET(coverartc_SOVERSION_AGE 0)
+
+MATH(EXPR coverartc_SOVERSION_MAJOR "${coverartc_SOVERSION_CURRENT} - ${coverartc_SOVERSION_AGE}")
+MATH(EXPR coverartc_SOVERSION_MINOR "${coverartc_SOVERSION_AGE}")
+MATH(EXPR coverartc_SOVERSION_PATCH "${coverartc_SOVERSION_REVISION}")
+
+SET(coverartc_VERSION ${coverartc_SOVERSION_MAJOR}.${coverartc_SOVERSION_MINOR}.${coverartc_SOVERSION_PATCH})
+SET(coverartc_SOVERSION ${coverartc_SOVERSION_MAJOR})
+
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
FIND_PACKAGE(Neon REQUIRED)
FIND_PACKAGE(Jansson REQUIRED)
@@ -31,13 +42,14 @@ SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix f
SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE)
SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libcoverartcc.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libcoverartcc.pc)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libcoverart.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libcoverart.pc)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
FILE(GLOB headers ${CMAKE_CURRENT_SOURCE_DIR}/include/coverart/*.h)
INSTALL(FILES ${headers} include/coverart/caa_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/coverart)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcoverart.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcoverartcc.pc ${CMAKE_CURRENT_BINARY_DIR}/libcoverart.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(tests)
@@ -50,5 +62,5 @@ ADD_CUSTOM_TARGET(docs
ADD_DEPENDENCIES(docs src_gen)
ADD_CUSTOM_TARGET(dist
- COMMAND git archive --prefix="libcoverart-${PROJECT_VERSION}/" release-${PROJECT_VERSION} | gzip -9 > libcoverart-${PROJECT_VERSION}.tar.gz
+ COMMAND git archive --prefix="libcoverart-${PROJECT_VERSION}/" master | gzip -9 > libcoverart-${PROJECT_VERSION}.tar.gz
)
diff --git a/Doxyfile.cmake b/Doxyfile.cmake
index 25a5ed9..af7a505 100644
--- a/Doxyfile.cmake
+++ b/Doxyfile.cmake
@@ -18,3 +18,4 @@ MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
PREDEFINED = LIBCOVERART_DEPRECATED=
REPEAT_BRIEF = NO
+HTML_TIMESTAMP = NO
diff --git a/README.md b/README.md
index 90f6644..4d31422 100644
--- a/README.md
+++ b/README.md
@@ -17,9 +17,13 @@ Compiling and Linking
This package provides a pkg-config script that returns the necessary compiler
and linker flags, as well as the version number. To build a small sample
-program one would use:
+program using the C++ API one would use:
- g++ -o test_app test_app.cpp `pkg-config libcoverart --cflags --libs`
+ g++ -o test_app test_app.cpp `pkg-config libcoverartcc --cflags --libs`
+
+To build a small sample program using the C API one would use:
+
+ gcc -o test_app test_app.c `pkgconfig libcoverart --cflags --libs`
If you don't want/can't use pkg-config and you are using the C API, make sure
you link in the C++ standard library:
diff --git a/developer/make-release.sh b/developer/make-release.sh
new file mode 100644
index 0000000..fc41e51
--- /dev/null
+++ b/developer/make-release.sh
@@ -0,0 +1,136 @@
+#!/bin/bash
+
+DoIt()
+{
+ SRCREPO="git://github.com/metabrainz/libcoverart.git"
+ PUSHURL="git at github.com:metabrainz/libcoverart.git"
+
+ #Enable these 4 lines for local access only
+ #rm -rf $SRCDIR/../flactag.git-local
+ #SRCREPO="$SRCDIR/../libcoverart.git"
+ #git init --bare $SRCREPO
+ #PUSHURL="$SRCREPO"
+
+ echo "Entering work directory"
+ cd $WORKDIR || return 1
+
+ echo "Cloning repository"
+ git clone --quiet $SRCREPO . || return 1
+
+ echo "Setting remote push URL"
+ git remote set-url origin --push $PUSHURL || return 1
+
+ echo "Running cmake"
+ cmake . >/dev/null || return 1
+
+ echo "Making tarball"
+ make dist >/dev/null || return 1
+
+ echo "Checking for tarball $TARBALL"
+ [ -f $TARBALL ] || return 1
+
+ echo "Copying tarball to $EXTRACTDIR"
+ cp $TARBALL $EXTRACTDIR || return 1
+
+ echo "Entering extract directory"
+ cd $EXTRACTDIR || return 1
+
+ echo "Extracting tarball"
+ tar xzf $TARBALL || return 1
+
+ echo "Building"
+ cd libcoverart-$VERSION || return 1
+ cmake . > /dev/null || return 1
+ make $MAKEARGS > /dev/null || return 1
+
+ echo "Install test"
+ mkdir "$EXTRACTDIR/install-test" | return 1
+ make DESTDIR="$EXTRACTDIR/install-test" install > /dev/null || return 1
+
+ echo "Installed binary test"
+ ldd "$EXTRACTDIR/install-test/usr/local/lib/libcoverart.so" > /dev/null || return 1
+
+ MD5=`md5sum $WORKDIR/$TARBALL | cut -d' ' -f1`
+ SHA224=`sha224sum $WORKDIR/$TARBALL | cut -d' ' -f1`
+
+ MAILTEXT="New release of libcoverart $VERSION is attached:\n\nMD5: $MD5\nSHA224: $SHA224"
+
+ if [ "$TAGANDPUSH" -eq "1" ]
+ then
+ echo "Tagging work repository"
+
+ cd $WORKDIR
+ git tag -s -u $KEYID -m "Tag release $VERSION" -m "MD5 checksum: $MD5" -m "SHA224 checksum: $SHA224" $TAGNAME || return 1
+
+ COMMIT=`git show $TAGNAME | grep commit | cut -d ' ' -f 2`
+
+ echo "Pushing new tag to origin"
+ git push origin master --tags || return 1
+
+ MAILTEXT="$MAILTEXT\nCOMMIT: $COMMIT\n"
+
+ if ! echo -e "$MAILTEXT" | mutt -s "libcoverart release" -a $TARBALL -- $KEYID
+ then
+ (echo -e "$MAILTEXT"; uuencode $TARBALL $TARBALL) | Mail -s "libcoverart release" $KEYID
+ fi
+
+ git --no-pager show --raw $TAGNAME
+
+ echo
+ fi
+
+ echo -e "$MAILTEXT"
+ return 0
+}
+
+VALIDARGS=0
+TAGANDPUSH=0
+
+if [ "$#" -eq "2" -o "$#" -eq "3" ]
+then
+ VALIDARGS=1
+
+ #rm -rf /tmp/tmp.*
+
+ if [ "$#" -eq "3" ]
+ then
+ if [ "x$3" = "x--tag-and-push" ]
+ then
+ TAGANDPUSH=1
+ else
+ VALIDARGS="0"
+ fi
+ fi
+fi
+
+if [ "$VALIDARGS" -eq "1" ]
+then
+ VERSION="$1"
+ KEYID="$2"
+
+ SRCDIR=`pwd`
+ TARBALL="libcoverart-$VERSION.tar.gz"
+ TAGNAME="test-$VERSION"
+
+ #Comment this line out to do test pushes
+ TAGNAME="release-$VERSION"
+
+ WORKDIR=`mktemp -d`
+ EXTRACTDIR=`mktemp -d`
+
+ echo "Using directories $WORKDIR and $EXTRACTDIR"
+
+ DoIt
+ RET=$?
+
+ if [ "$RET" -eq "1" -o "$TAGANDPUSH" -eq "1" ]
+ then
+ rm -rf $WORKDIR
+ else
+ echo "Files remain in $WORKDIR"
+ fi
+
+ rm -rf $EXTRACTDIR
+else
+ echo "Usage: $0 version keyid [ --tag-and-push ]"
+fi
diff --git a/examples/.gitignore b/examples/.gitignore
deleted file mode 100644
index e495f5e..0000000
--- a/examples/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-example
-example_c
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index ec10201..32fdca6 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -5,10 +5,13 @@ INCLUDE_DIRECTORIES(
${NEON_INCLUDE_DIR}
${JANSSON_INCLUDE_DIR}
)
-LINK_LIBRARIES(coverart ${NEON_LIBRARIES} ${JANSSON_LIBRARIES})
+
ADD_EXECUTABLE(example example.cc)
ADD_EXECUTABLE(example_c example_c.c)
+TARGET_LINK_LIBRARIES(example coverartcc ${NEON_LIBRARIES})
+TARGET_LINK_LIBRARIES(example_c coverart ${NEON_LIBRARIES})
+
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -pedantic-errors")
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/examples/example_c.c b/examples/example_c.c
index a4ddd12..6a05831 100644
--- a/examples/example_c.c
+++ b/examples/example_c.c
@@ -23,6 +23,7 @@
----------------------------------------------------------------------------*/
+#include <stdlib.h>
#include <stdio.h>
#include <limits.h>
#include <string.h>
@@ -44,9 +45,12 @@ int main(int argc, const char *argv[])
{
if (0!=caa_imagedata_size(ImageData))
{
- char FileName[PATH_MAX];
+ int size;
+ char *FileName;
FILE *fptr;
+ size=snprintf(NULL,0,"%s-front.jpg",ReleaseID);
+ FileName=malloc((size+1) * sizeof(char));
sprintf(FileName,"%s-front.jpg",ReleaseID);
printf("Saving front to '%s'\n",FileName);
@@ -57,6 +61,8 @@ int main(int argc, const char *argv[])
fclose(fptr);
printf("Saved front to '%s'\n",FileName);
}
+
+ free(FileName);
}
else
{
@@ -71,9 +77,12 @@ int main(int argc, const char *argv[])
{
if (0!=caa_imagedata_size(ImageData))
{
- char FileName[PATH_MAX];
+ int size;
+ char *FileName;
FILE *fptr;
+ size=snprintf(NULL,0,"%s-back.jpg",ReleaseID);
+ FileName=malloc((size+1) * sizeof(char));
sprintf(FileName,"%s-back.jpg",ReleaseID);
printf("Saving back to '%s'\n",FileName);
@@ -84,6 +93,8 @@ int main(int argc, const char *argv[])
fclose(fptr);
printf("Saved back to '%s'\n",FileName);
}
+
+ free(FileName);
}
else
{
@@ -109,14 +120,25 @@ int main(int argc, const char *argv[])
CaaImage Image=caa_image_list_item(ImageList,ImageNum);
if (Image)
{
- char ID[PATH_MAX];
- char Comment[PATH_MAX];
- char URL[PATH_MAX];
+ char *ID;
+ char *Comment;
+ char *URL;
+ int ID_size;
+ int Comment_size;
+ int URL_size;
CaaThumbnails Thumbnails=caa_image_get_thumbnails(Image);
- caa_image_get_id(Image,ID,sizeof(ID));
- caa_image_get_comment(Image,Comment,sizeof(Comment));
- caa_image_get_image(Image,URL,sizeof(URL));
+ ID_size=caa_image_get_id(Image, NULL, 0) + 1;
+ Comment_size=caa_image_get_comment(Image, NULL, 0) + 1;
+ URL_size=caa_image_get_image(Image, NULL, 0) + 1;
+
+ ID=malloc(ID_size * sizeof(char));
+ Comment=malloc(Comment_size * sizeof(char));
+ URL=malloc(URL_size * sizeof(char));
+
+ caa_image_get_id(Image,ID,ID_size);
+ caa_image_get_comment(Image,Comment,Comment_size);
+ caa_image_get_image(Image,URL,URL_size);
printf("\nApproved: %d\n",caa_image_get_approved(Image));
printf("Back: %d\n",caa_image_get_back(Image));
@@ -131,9 +153,12 @@ int main(int argc, const char *argv[])
{
if (0!=caa_imagedata_size(ImageData))
{
- char FileName[PATH_MAX];
+ int size;
+ char *FileName;
FILE *fptr;
+ size=snprintf(NULL,0,"%s-%s-full.jpg",ReleaseID,ID);
+ FileName=malloc((size+1) * sizeof(char));
sprintf(FileName,"%s-%s-full.jpg",ReleaseID,ID);
printf("Saving full for '%s' to '%s'\n",ID,FileName);
@@ -144,6 +169,8 @@ int main(int argc, const char *argv[])
fclose(fptr);
printf("Saved full to '%s'\n",FileName);
}
+
+ free(FileName);
}
caa_imagedata_delete(ImageData);
@@ -158,9 +185,12 @@ int main(int argc, const char *argv[])
{
if (0!=caa_imagedata_size(ImageData))
{
- char FileName[PATH_MAX];
+ int size;
+ char *FileName;
FILE *fptr;
+ size=snprintf(NULL,0,"%s-%s-500.jpg",ReleaseID,ID);
+ FileName=malloc((size+1) * sizeof(char));
sprintf(FileName,"%s-%s-500.jpg",ReleaseID,ID);
printf("Saving 500 for '%s' to '%s'\n",ID,FileName);
@@ -171,6 +201,8 @@ int main(int argc, const char *argv[])
fclose(fptr);
printf("Saved 500 to '%s'\n",FileName);
}
+
+ free(FileName);
}
caa_imagedata_delete(ImageData);
@@ -183,9 +215,12 @@ int main(int argc, const char *argv[])
{
if (0!=caa_imagedata_size(ImageData))
{
- char FileName[PATH_MAX];
+ int size;
+ char *FileName;
FILE *fptr;
+ size=snprintf(NULL,0,"%s-%s-250.jpg",ReleaseID,ID);
+ FileName=malloc((size+1) * sizeof(char));
sprintf(FileName,"%s-%s-250.jpg",ReleaseID,ID);
printf("Saving 250 for '%s' to '%s'\n",ID,FileName);
@@ -196,6 +231,8 @@ int main(int argc, const char *argv[])
fclose(fptr);
printf("Saved 250 to '%s'\n",FileName);
}
+
+ free(FileName);
}
caa_imagedata_delete(ImageData);
@@ -203,6 +240,10 @@ int main(int argc, const char *argv[])
}
}
}
+
+ free(ID);
+ free(Comment);
+ free(URL);
}
}
}
diff --git a/include/coverart/.gitignore b/include/coverart/.gitignore
deleted file mode 100644
index a592f27..0000000
--- a/include/coverart/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-caa_c.h
diff --git a/libcoverart.pc.cmake b/libcoverart.pc.cmake
index 03f9b9d..0a83a0c 100644
--- a/libcoverart.pc.cmake
+++ b/libcoverart.pc.cmake
@@ -4,10 +4,10 @@ libdir=${LIB_INSTALL_DIR}
includedir=${INCLUDE_INSTALL_DIR}
Name: ${PROJECT_NAME}
-Description: The Cover Art Archive Client Library.
+Description: The Cover Art Archive Client Library C interface.
URL: http://musicbrainz.org/doc/libcoverart
Version: ${PROJECT_VERSION}
-Requires.private: neon >= 0.25, jansson
+Requires.private: ${PROJECT_NAME}cc
Libs: -L${LIB_INSTALL_DIR} -lcoverart
Cflags: -I${INCLUDE_INSTALL_DIR}
diff --git a/libcoverart.pc.cmake b/libcoverartcc.pc.cmake
similarity index 83%
copy from libcoverart.pc.cmake
copy to libcoverartcc.pc.cmake
index 03f9b9d..8000027 100644
--- a/libcoverart.pc.cmake
+++ b/libcoverartcc.pc.cmake
@@ -3,11 +3,11 @@ exec_prefix=${EXEC_INSTALL_PREFIX}
libdir=${LIB_INSTALL_DIR}
includedir=${INCLUDE_INSTALL_DIR}
-Name: ${PROJECT_NAME}
+Name: ${PROJECT_NAME}cc
Description: The Cover Art Archive Client Library.
URL: http://musicbrainz.org/doc/libcoverart
Version: ${PROJECT_VERSION}
Requires.private: neon >= 0.25, jansson
-Libs: -L${LIB_INSTALL_DIR} -lcoverart
+Libs: -L${LIB_INSTALL_DIR} -lcoverartcc
Cflags: -I${INCLUDE_INSTALL_DIR}
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 2e5e55a..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-libcoverart*.so.*
-caa_c.cc
-caa_c.h
-make-c-interface
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7c67eca..2e60d65 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,13 +3,16 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../include
${CMAKE_CURRENT_BINARY_DIR}/../include
+ ${CMAKE_CURRENT_BINARY_DIR}/..
${NEON_INCLUDE_DIR}
${JANSSON_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIR}
)
-SET(_sources HTTPFetch.cc CoverArt.cc ReleaseInfo.cc ImageList.cc Image.cc
- Thumbnails.cc TypeList.cc caa_c.cc Type.cc)
+SET(_sourcescc HTTPFetch.cc CoverArt.cc ReleaseInfo.cc ImageList.cc Image.cc
+ Thumbnails.cc TypeList.cc Type.cc)
+
+SET(_sourcesc caa_c.cc)
# when crosscompiling import the executable targets from a file
IF(CMAKE_CROSSCOMPILING)
@@ -38,16 +41,23 @@ ADD_CUSTOM_COMMAND(
ADD_CUSTOM_TARGET(src_gen DEPENDS caa_c.h)
-ADD_LIBRARY(coverart SHARED ${_sources})
+ADD_LIBRARY(coverartcc SHARED ${_sourcescc})
+ADD_LIBRARY(coverart SHARED ${_sourcesc})
-SET_TARGET_PROPERTIES(coverart PROPERTIES
+SET_TARGET_PROPERTIES(coverartcc PROPERTIES
VERSION ${coverart_VERSION}
SOVERSION ${coverart_SOVERSION}
DEFINE_SYMBOL MB_API_EXPORTS
)
+SET_TARGET_PROPERTIES(coverart PROPERTIES
+ VERSION ${coverartc_VERSION}
+ SOVERSION ${coverartc_SOVERSION}
+ DEFINE_SYMBOL MB_API_EXPORTS
+)
+
if(CMAKE_BUILD_TYPE STREQUAL Debug)
- SET_TARGET_PROPERTIES(coverart PROPERTIES
+ SET_TARGET_PROPERTIES(coverartcc PROPERTIES
DEFINE_SYMBOL _COVERART_DEBUG_
)
IF(CMAKE_COMPILER_IS_GNUCXX)
@@ -55,15 +65,16 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
endif(CMAKE_BUILD_TYPE STREQUAL Debug)
-TARGET_LINK_LIBRARIES(coverart ${NEON_LIBRARIES} ${JANSSON_LIBRARIES})
+TARGET_LINK_LIBRARIES(coverartcc ${NEON_LIBRARIES} ${JANSSON_LIBRARIES})
+TARGET_LINK_LIBRARIES(coverart coverartcc)
IF(WIN32)
- TARGET_LINK_LIBRARIES(coverart wsock32 winmm ws2_32)
+ TARGET_LINK_LIBRARIES(coverartcc wsock32 winmm ws2_32)
ENDIF(WIN32)
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -pedantic-errors")
- set_source_files_properties(mb4_c.cc PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
+ set_source_files_properties(ca_c.cc PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
set_source_files_properties(ReleaseInfo.cc PROPERTIES COMPILE_FLAGS "-Wno-long-long")
set_source_files_properties(ImageList.cc PROPERTIES COMPILE_FLAGS "-Wno-long-long")
set_source_files_properties(Image.cc PROPERTIES COMPILE_FLAGS "-Wno-long-long")
@@ -73,4 +84,5 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
set_source_files_properties(caa_c.cc PROPERTIES COMPILE_FLAGS "-Wno-long-long")
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+INSTALL(TARGETS coverartcc DESTINATION ${LIB_INSTALL_DIR})
INSTALL(TARGETS coverart DESTINATION ${LIB_INSTALL_DIR})
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index a6c8e6b..0000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-test
-ctest
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c765eeb..1d1a987 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,10 +2,12 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../include
${CMAKE_CURRENT_BINARY_DIR}/../include
)
-LINK_LIBRARIES(coverart ${NEON_LIBRARIES})
-ADD_EXECUTABLE(test test.cc)
+ADD_EXECUTABLE(cctest test.cc)
ADD_EXECUTABLE(ctest ctest.c)
+TARGET_LINK_LIBRARIES(cctest coverartcc ${NEON_LIBRARIES})
+TARGET_LINK_LIBRARIES(ctest coverart ${NEON_LIBRARIES})
+
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -pedantic-errors")
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
--
libcoverart packaging
More information about the pkg-multimedia-commits
mailing list