Ticket #606: eds12_find_v2.diff

FindEDS1.2.cmake

@@ -41 +41 @@
         INCLUDE( UsePkgConfig )
         # Take care about evolution-data-server-1.2.pc settings
         PKGCONFIG( evolution-data-server-1.2 _evolution-data-server-1.2_include_DIR _evolution-data-server-1.2_link_DIR _evolution-data-server-1.2_link_FLAGS _evolution-data-server-1.2_cflags )
+
         # Take care about libebook-1.2.pc settings
         PKGCONFIG( libebook-1.2 _libebook-1.2_include_DIR _libebook-1.2_link_DIR _libebook-1.2_link_FLAGS _libebook-1.2_cflags )
+        EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS libebook-1.2 --variable=privincludedir OUTPUT_VARIABLE _libebook-1.2_include_DIR )
+        STRING( REGEX REPLACE "[\r\n]" " " _libebook-1.2_include_DIR "${_libebook-1.2_include_DIR}" )
+
         # Take care about libecal-1.2.pc settings
         PKGCONFIG( libecal-1.2 _libecal-1.2_include_DIR _libecal-1.2_link_DIR _libecal-1.2_link_FLAGS _libecal-1.2_cflags )
+        EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS libecal-1.2 --variable=privincludedir OUTPUT_VARIABLE _libecal-1.2_include_DIR )
+        STRING( REGEX REPLACE "[\r\n]" " " _libecal-1.2_include_DIR "${_libecal-1.2_include_DIR}" )
+
         # Take care about libedata-book-1.2.pc settings
         PKGCONFIG( libedata-book-1.2 _libedata-book-1.2_include_DIR _libedata-book-1.2_link_DIR _libedata-book-1.2_link_FLAGS _libedata-book-1.2_cflags )
+        EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS libedata-book-1.2 --variable=privincludedir OUTPUT_VARIABLE _libedata-book-1.2_include_DIR )
+        STRING( REGEX REPLACE "[\r\n]" " " _libedata-book-1.2_include_DIR "${_libedata-book-1.2_include_DIR}" )
+
         # Take care about libedata-cal-1.2.pc settings
         PKGCONFIG( libedata-cal-1.2 _libedata-cal-1.2_include_DIR _libedata-cal-1.2_link_DIR _libedata-cal-1.2_link_FLAGS _libedata-cal-1.2_cflags )
+        EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS libedata-cal-1.2 --variable=privincludedir OUTPUT_VARIABLE _libedata-cal-1.2_include_DIR )
+        STRING( REGEX REPLACE "[\r\n]" " " _libedata-cal-1.2_include_DIR "${_libedata-cal-1.2_include_DIR}" )
+
         # Take care about libedataserver-1.2.pc settings
         PKGCONFIG( libedataserver-1.2 _libedataserver-1.2_include_DIR _libedataserver-1.2_link_DIR _libedataserver-1.2_link_FLAGS _libedataserver-1.2_cflags )
+        EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS libedataserver-1.2 --variable=privincludedir OUTPUT_VARIABLE _libedataserver-1.2_include_DIR )
+        STRING( REGEX REPLACE "[\r\n]" " " _libedataserver-1.2_include_DIR "${_libedataserver-1.2_include_DIR}" )
+
 ENDIF ( NOT WIN32 )
 
 # Look for libebook1.2 include dir and libraries, and take care about pkg-config first...