diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-26 13:02:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-26 13:02:57 (GMT) |
| commit | 63357bf9690c7a4ab95fd4114c09c07b4a123e26 (patch) | |
| tree | 7c7d37ea7e3d7bff145e5bfe943a97090fcfc52d /Modules | |
| parent | c1631efa0eb0b33680ea73f745379eebf4d573a8 (diff) | |
| parent | a34839d2c92e11a9579b118d4c3cb07104b7179c (diff) | |
| download | CMake-63357bf9690c7a4ab95fd4114c09c07b4a123e26.zip CMake-63357bf9690c7a4ab95fd4114c09c07b4a123e26.tar.gz CMake-63357bf9690c7a4ab95fd4114c09c07b4a123e26.tar.bz2 | |
Merge topic 'FindFreetype-gtkmm'
a34839d FindFreetype: Detect Freetype installed by GtkMM installer for win
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindFreetype.cmake | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake index 1df2399..ccea991 100644 --- a/Modules/FindFreetype.cmake +++ b/Modules/FindFreetype.cmake @@ -50,6 +50,9 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h /usr/local/X11R6 /usr/local/X11 /usr/freeware + ENV GTKMM_BASEPATH + [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] PATH_SUFFIXES include/freetype2 include ) @@ -61,6 +64,9 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h /usr/local/X11R6 /usr/local/X11 /usr/freeware + ENV GTKMM_BASEPATH + [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] PATH_SUFFIXES include/freetype2 include ) @@ -70,10 +76,13 @@ find_library(FREETYPE_LIBRARY ENV FREETYPE_DIR PATH_SUFFIXES lib PATHS - /usr/X11R6 - /usr/local/X11R6 - /usr/local/X11 - /usr/freeware + /usr/X11R6 + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware + ENV GTKMM_BASEPATH + [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] ) # set the user variables |