diff options
| -rw-r--r-- | modules/FindExiv2.cmake | 4 | ||||
| -rw-r--r-- | modules/FindGettext.cmake | 7 | ||||
| -rw-r--r-- | modules/FindKdepim.cmake | 4 | ||||
| -rw-r--r-- | modules/FindKexiv2.cmake | 2 | ||||
| -rw-r--r-- | modules/FindKipi.cmake | 4 | ||||
| -rw-r--r-- | modules/FindLCMS.cmake | 4 | ||||
| -rw-r--r-- | modules/FindOpenEXR.cmake | 10 |
7 files changed, 2 insertions, 33 deletions
diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index 2f6caa1d..884be4ed 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -45,15 +45,11 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) FIND_PATH(EXIV2_INCLUDE_DIR exiv2/exif.hpp ${_EXIV2IncDir} - /usr/include - /usr/local/include ) FIND_LIBRARY(EXIV2_LIBRARIES NAMES exiv2 libexiv2 PATHS ${_EXIV2LinkDir} - /usr/lib - /usr/local/lib ) if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) diff --git a/modules/FindGettext.cmake b/modules/FindGettext.cmake index c6b096c8..24c2f98a 100644 --- a/modules/FindGettext.cmake +++ b/modules/FindGettext.cmake @@ -38,11 +38,8 @@ else (LIBC_HAS_DGETTEXT OR LIBINTL_HAS_DGETTEXT) set(GETTEXT_SOURCE "built in libc") set(GETTEXT_FOUND TRUE) else (LIBC_HAS_DGETTEXT) - FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl libintl - PATHS - /usr/lib - /usr/local/lib - ) + FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl libintl ) + CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT) if (LIBINTL_HAS_DGETTEXT) set(GETTEXT_SOURCE "in ${LIBINTL_LIBRARY}") diff --git a/modules/FindKdepim.cmake b/modules/FindKdepim.cmake index ac33bc1f..f468c883 100644 --- a/modules/FindKdepim.cmake +++ b/modules/FindKdepim.cmake @@ -17,15 +17,11 @@ endif (KDEPIM_INCLUDE_DIR) FIND_PATH(KDEPIM_INCLUDE_DIR NAMES kdepimprotocols.h PATHS ${INCLUDE_INSTALL_DIR} - /usr/include - /usr/local/include ) FIND_LIBRARY(KDEPIM_LIBRARIES NAMES kdepim PATHS ${LIB_INSTALL_DIR} - /usr/lib - /usr/local/lib ) if (KDEPIM_LIBRARIES AND KDEPIM_INCLUDE_DIR) diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index 0d42a747..68df0c1e 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -70,8 +70,6 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2 PATHS ${_KEXIV2LinkDir} - /usr/lib - /usr/local/lib ) if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) diff --git a/modules/FindKipi.cmake b/modules/FindKipi.cmake index 44deca3c..15e2643e 100644 --- a/modules/FindKipi.cmake +++ b/modules/FindKipi.cmake @@ -63,15 +63,11 @@ else (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) FIND_PATH(KIPI_INCLUDE_DIR libkipi/version.h ${_KIPIIncDir} - /usr/include - /usr/local/include ) FIND_LIBRARY(KIPI_LIBRARIES NAMES kipi PATHS ${_KIPILinkDir} - /usr/lib - /usr/local/lib ) if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) diff --git a/modules/FindLCMS.cmake b/modules/FindLCMS.cmake index d992a651..835242f6 100644 --- a/modules/FindLCMS.cmake +++ b/modules/FindLCMS.cmake @@ -17,10 +17,8 @@ endif(NOT WIN32) find_path(LCMS_INCLUDE_DIR lcms.h ${_LcmsIncDir} ${CMAKE_INSTALL_PREFIX}/include - /usr/include /usr/include/lcms /usr/include/liblcms1 - /usr/local/include /usr/local/include/lcms NO_DEFAULT_PATH ) @@ -31,9 +29,7 @@ find_library(LCMS_LIBRARIES NAMES lcms liblcms PATHS ${_LcmsLinkDir} ${CMAKE_INSTALL_PREFIX}/lib - /usr/lib /usr/lib/lcms - /usr/local/lib /usr/local/lib/lcms NO_DEFAULT_PATH ) diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index 36950b83..fafde519 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -26,38 +26,28 @@ ENDIF (NOT WIN32) FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h ${_OpenEXRIncDir} ${_OpenEXRIncDir}/OpenEXR/ - /usr/include - /usr/local/include ) FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib ) FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex PATHS ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib ) FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath PATHS ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib ) FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf PATHS ${_OPENEXRLinkDir} - /usr/lib - /usr/local/lib ) if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) |