From fa7288702abf151c5c03db864d5b0f87e6b69406 Mon Sep 17 00:00:00 2001 From: Joerg Mayer Date: Sun, 16 Mar 2014 12:39:30 +0100 Subject: Fix GTK3 detection (or more specific: the include paths) on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia0aef096849d1935ca4a6d1d31aabd099087cf29 Reviewed-on: https://code.wireshark.org/review/694 Reviewed-by: Jörg Mayer --- cmake/modules/FindGTK3.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmake/modules/FindGTK3.cmake') diff --git a/cmake/modules/FindGTK3.cmake b/cmake/modules/FindGTK3.cmake index 9eea94916b..7a964a6227 100644 --- a/cmake/modules/FindGTK3.cmake +++ b/cmake/modules/FindGTK3.cmake @@ -41,8 +41,8 @@ pkg_check_modules( PC_GTK3 gtk+-3.0 QUIET ) # Hack around broken .pc files in Windows GTK bundle if( DEFINED GTK3_HINTS ) - string( REGEX REPLACE "-I/.*/include" "-I${GTK3_HINTS}/include" PC_GTK3_INCLUDEDIR "${PC_GTK3_INCLUDEDIR}" ) - string( REGEX REPLACE "-I/.*/include" "-I${GTK3_HINTS}/include" PC_GTK3_INCLUDE_DIRS "${PC_GTK3_INCLUDE_DIRS}" ) + string( REGEX REPLACE "(-I|^|;)/[^;]*/include" "\\1${GTK3_HINTS}/include" PC_GTK3_INCLUDEDIR "${PC_GTK3_INCLUDEDIR}" ) + string( REGEX REPLACE "(-I|^|;)/[^;]*/include" "\\1${GTK3_HINTS}/include" PC_GTK3_INCLUDE_DIRS "${PC_GTK3_INCLUDE_DIRS}" ) string( REGEX REPLACE "-L/.*/lib" "-L${GTK3_HINTS}/lib" PC_GTK3_LIBRARY_DIRS "${PC_GTK3_LIBRARY_DIRS}" ) set( PC_GTK3_CFLAGS ) set( PC_GTK3_CFLAGS_OTHER ) -- cgit v1.2.1