diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2014-03-16 12:39:30 +0100 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2014-03-16 11:42:32 +0000 |
| commit | fa7288702abf151c5c03db864d5b0f87e6b69406 (patch) | |
| tree | 1d9e502e152ee3e3a8b1d75dbc0f052ef8cd655e /cmake/modules/FindGTK3.cmake | |
| parent | b0b6064542515ec79f5f9128d5f9caad98eb5470 (diff) | |
| download | wireshark-fa7288702abf151c5c03db864d5b0f87e6b69406.tar.gz | |
Fix GTK3 detection (or more specific: the include paths) on Windows
Change-Id: Ia0aef096849d1935ca4a6d1d31aabd099087cf29
Reviewed-on: https://code.wireshark.org/review/694
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'cmake/modules/FindGTK3.cmake')
| -rw-r--r-- | cmake/modules/FindGTK3.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
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 ) |