[Traverso-commit] traverso CMakeLists.txt src/3rdparty/slv2/CMake...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/12/07 13:21:27

Modified files:
        .              : CMakeLists.txt 
        src/3rdparty/slv2: CMakeLists.txt 

Log message:
        * use pkg-config first to check if redland is available, if not, fall 
back to header checking.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/3rdparty/slv2/CMakeLists.txt?cvsroot=traverso&r1=1.2&r2=1.3

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/CMakeLists.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- CMakeLists.txt      6 Dec 2007 18:49:49 -0000       1.19
+++ CMakeLists.txt      7 Dec 2007 13:21:26 -0000       1.20
@@ -83,6 +83,7 @@
 SET(MINIMAL_MAD_VERSION 0.15.0)
 SET(MINIMAL_FLAC_VERSION 1.1.2)
 SET(MINIMAL_FFTW_VERSION 3.0.0)
+SET(MINIMAL_REDLAND_VERSION 1.0.2)
 
 SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -Wall ${CXX_FLAGS}")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall -fPIC ${CXX_FLAGS}")
@@ -165,6 +166,12 @@
                        SET(HAVE_SYSTEM_SLV2 TRUE)
                ENDIF(SLV2_FOUND)
        ELSE(USE_SYSTEM_SLV2_LIBRARY)
+               PKG_CHECK_MODULES(REDLAND  redland>=${MINIMAL_REDLAND_VERSION})
+               IF (REDLAND_FOUND)
+                       MESSAGE("-- REDLAND Library Found OK")
+                       SET(REDLAND_INCLUDE_DIR /usr/include/redland)
+               ELSE(REDLAND_FOUND)
+                       MESSAGE("-- REDLAND Library not found with pkg-config, 
looking for headers now")
                CHECK_INCLUDE_FILE("librdf.h" HAVE_LIBRDF_H)
                IF(NOT HAVE_LIBRDF_H)
                        CHECK_INCLUDE_FILE("redland/librdf.h" 
HAVE_REDLAND_LIBRDF_H)
@@ -172,7 +179,8 @@
                                        MESSAGE(FATAL_ERROR "lv2 support 
requested using internal slv2 lib, but the needed rdf development headers could 
not be found!\nPlease install the rdf development package (Usually called 
librdf-dev), remove CMakeCache.txt and run cmake again")
                        ENDIF(NOT HAVE_REDLAND_LIBRDF_H)
                ENDIF(NOT HAVE_LIBRDF_H)
-               
+                       MESSAGE("-- REDLAND Library Found OK")
+               ENDIF(REDLAND_FOUND)
                SET(USE_INTERNAL_SLV2_LIB TRUE)
        ENDIF(USE_SYSTEM_SLV2_LIBRARY)
        

Index: src/3rdparty/slv2/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/3rdparty/slv2/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/3rdparty/slv2/CMakeLists.txt    7 Nov 2007 11:41:50 -0000       1.2
+++ src/3rdparty/slv2/CMakeLists.txt    7 Dec 2007 13:21:26 -0000       1.3
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES(
+INCLUDE_DIRECTORIES(${REDLAND_INCLUDE_DIR}
 )
 
 SET(TRAVERSO_SLV2_SOURCES