diff options
| -rw-r--r-- | modules/FindACL.cmake | 14 | ||||
| -rw-r--r-- | modules/FindAGG.cmake | 4 | ||||
| -rw-r--r-- | modules/FindBerkeleyDB.cmake | 7 | ||||
| -rw-r--r-- | modules/FindFAM.cmake | 13 | ||||
| -rw-r--r-- | modules/FindFreetype.cmake | 2 | ||||
| -rw-r--r-- | modules/FindPNG.cmake | 3 |
6 files changed, 7 insertions, 36 deletions
diff --git a/modules/FindACL.cmake b/modules/FindACL.cmake index 9fb06782..e21e25fa 100644 --- a/modules/FindACL.cmake +++ b/modules/FindACL.cmake @@ -21,17 +21,9 @@ if (HAVE_ATTR_LIBATTR_H AND HAVE_SYS_XATTR_H AND HAVE_SYS_ACL_H AND HAVE_ACL_LIB endif (HAVE_ATTR_LIBATTR_H AND HAVE_SYS_XATTR_H AND HAVE_SYS_ACL_H AND HAVE_ACL_LIBACL_H) if (ACL_HEADERS_FOUND) - FIND_LIBRARY(ACL_LIBS NAMES acl - PATHS - /usr/lib - /usr/local/lib - ) - - FIND_LIBRARY(ATTR_LIBS NAMES attr - PATHS - /usr/lib - /usr/local/lib - ) + FIND_LIBRARY(ACL_LIBS NAMES acl ) + + FIND_LIBRARY(ATTR_LIBS NAMES attr ) endif (ACL_HEADERS_FOUND) if (ACL_HEADERS_FOUND AND ACL_LIBS AND ATTR_LIBS) diff --git a/modules/FindAGG.cmake b/modules/FindAGG.cmake index 178c772b..57b1d29f 100644 --- a/modules/FindAGG.cmake +++ b/modules/FindAGG.cmake @@ -28,15 +28,11 @@ IF (NOT WIN32) ENDIF (NOT WIN32) FIND_PATH(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h ${_AGGIncDir} - /usr/include - /usr/local/include ) FIND_LIBRARY(AGG_LIBRARIES NAMES agg PATHS ${_AGGLinkDir} - /usr/lib - /usr/local/lib ) if (AGG_INCLUDE_DIR AND AGG_LIBRARIES) diff --git a/modules/FindBerkeleyDB.cmake b/modules/FindBerkeleyDB.cmake index 2a8ba293..e68af609 100644 --- a/modules/FindBerkeleyDB.cmake +++ b/modules/FindBerkeleyDB.cmake @@ -12,16 +12,11 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. FIND_PATH(BERKELEY_DB_INCLUDE_DIR db.h - /usr/include/ /usr/include/db4 /usr/local/include/db4 ) -FIND_LIBRARY(BERKELEY_DB_LIBRARIES NAMES db - PATHS - /usr/lib - /usr/local/lib -) +FIND_LIBRARY(BERKELEY_DB_LIBRARIES NAMES db ) IF(BERKELEY_DB_INCLUDE_DIR AND BERKELEY_DB_LIBRARIES) SET(BERKELEY_DB_FOUND TRUE) diff --git a/modules/FindFAM.cmake b/modules/FindFAM.cmake index bdfa0e03..d7144d52 100644 --- a/modules/FindFAM.cmake +++ b/modules/FindFAM.cmake @@ -16,16 +16,9 @@ if (FAM_INCLUDE_DIR) set(FAM_FIND_QUIETLY TRUE) endif (FAM_INCLUDE_DIR) -FIND_PATH(FAM_INCLUDE_DIR fam.h - /usr/include - /usr/local/include -) - -FIND_LIBRARY(FAM_LIBRARIES NAMES fam - PATHS - /usr/lib - /usr/local/lib -) +FIND_PATH(FAM_INCLUDE_DIR fam.h) + +FIND_LIBRARY(FAM_LIBRARIES NAMES fam ) if (FAM_INCLUDE_DIR AND FAM_LIBRARIES) diff --git a/modules/FindFreetype.cmake b/modules/FindFreetype.cmake index 2ce6eab3..f061e71a 100644 --- a/modules/FindFreetype.cmake +++ b/modules/FindFreetype.cmake @@ -19,8 +19,6 @@ if (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR) FIND_PROGRAM(FREETYPECONFIG_EXECUTABLE NAMES freetype-config PATHS - /usr/bin - /usr/local/bin /opt/local/bin ) diff --git a/modules/FindPNG.cmake b/modules/FindPNG.cmake index c0c18d8e..1648d82e 100644 --- a/modules/FindPNG.cmake +++ b/modules/FindPNG.cmake @@ -21,15 +21,12 @@ SET(PNG_FOUND "NO") IF(ZLIB_FOUND) FIND_PATH(PNG_PNG_INCLUDE_DIR png.h - /usr/local/include - /usr/include /usr/local/include/libpng # OpenBSD ) SET(PNG_NAMES ${PNG_NAMES} png libpng) FIND_LIBRARY(PNG_LIBRARY NAMES ${PNG_NAMES} - PATHS /usr/lib /usr/local/lib ) IF (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR) |