Magellan Linux

Diff of /trunk/musicbrainz/patches/musicbrainz-4.0.3-support-out-of-source-build.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1910 by niro, Fri Oct 12 11:50:12 2012 UTC revision 1911 by niro, Fri Oct 12 11:55:32 2012 UTC
# Line 24  diff -Naur libmusicbrainz-4.0.3/examples Line 24  diff -Naur libmusicbrainz-4.0.3/examples
24   ADD_EXECUTABLE(cdlookup cdlookup.cc)   ADD_EXECUTABLE(cdlookup cdlookup.cc)
25  diff -Naur libmusicbrainz-4.0.3/src/CMakeLists.txt libmusicbrainz-4.0.3-magellan/src/CMakeLists.txt  diff -Naur libmusicbrainz-4.0.3/src/CMakeLists.txt libmusicbrainz-4.0.3-magellan/src/CMakeLists.txt
26  --- libmusicbrainz-4.0.3/src/CMakeLists.txt 2012-05-16 21:45:56.000000000 +0200  --- libmusicbrainz-4.0.3/src/CMakeLists.txt 2012-05-16 21:45:56.000000000 +0200
27  +++ libmusicbrainz-4.0.3-magellan/src/CMakeLists.txt 2012-10-12 15:49:26.858983101 +0200  +++ libmusicbrainz-4.0.3-magellan/src/CMakeLists.txt 2012-10-12 15:59:16.054983561 +0200
28  @@ -1,5 +1,10 @@  @@ -1,5 +1,10 @@
29   SET(CMAKE_INCLUDE_CURRENT_DIR ON)   SET(CMAKE_INCLUDE_CURRENT_DIR ON)
30  -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../include ${NEON_INCLUDE_DIR})  -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../include ${NEON_INCLUDE_DIR})
# Line 37  diff -Naur libmusicbrainz-4.0.3/src/CMak Line 37  diff -Naur libmusicbrainz-4.0.3/src/CMak
37    
38   SET(_sources Alias.cc Annotation.cc Artist.cc ArtistCredit.cc Attribute.cc CDStub.cc Collection.cc   SET(_sources Alias.cc Annotation.cc Artist.cc ArtistCredit.cc Attribute.cc CDStub.cc Collection.cc
39   Disc.cc Entity.cc FreeDBDisc.cc HTTPFetch.cc ISRC.cc Label.cc LabelInfo.cc Lifespan.cc List.cc   Disc.cc Entity.cc FreeDBDisc.cc HTTPFetch.cc ISRC.cc Label.cc LabelInfo.cc Lifespan.cc List.cc
40  @@ -14,6 +19,7 @@  @@ -13,7 +18,7 @@
41     ADD_CUSTOM_COMMAND(
42   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb4_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb4_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz4/mb4_c.h   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb4_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb4_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz4/mb4_c.h
43   COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb4_c.cc mb4_c.h   COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb4_c.cc mb4_c.h
44   COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb4_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz4  - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb4_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz4
45  + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb4_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz4/mb4_c.h  + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb4_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz4/mb4_c.h
46   DEPENDS make-c-interface cinterface.xml *.inc   DEPENDS make-c-interface cinterface.xml *.inc
47   )   )

Legend:
Removed from v.1910  
changed lines
  Added in v.1911