[SCM] libgroove/upstream: Look for includes in the current source tree.

andrewrk-guest at users.alioth.debian.org andrewrk-guest at users.alioth.debian.org
Sat May 31 19:00:01 UTC 2014


The following commit has been merged in the upstream branch:
commit 4df47588c6b72b9184eda3b97fb04fcd7b64dc89
Author: Pietro Cerutti <gahr at gahr.ch>
Date:   Mon May 19 11:55:08 2014 +0200

    Look for includes in the current source tree.
    
    This fixes a build issue when a previous version of the library is installed
    and header files are resolved into, say, /usr/local/include.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f71563c..a182808 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,6 +249,7 @@ set_target_properties(groove PROPERTIES
 if(LIBGROOVE_LDFLAGS)
   set_target_properties(groove PROPERTIES LINK_FLAGS ${LIBGROOVE_LDFLAGS})
 endif()
+include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_BINARY_DIR})
 if(LIBAV_IS_BUNDLED)
   target_link_libraries(groove

-- 
libgroove packaging



More information about the pkg-multimedia-commits mailing list