diff options
| -rw-r--r-- | modules/FindSane.cmake | 13 | ||||
| -rw-r--r-- | modules/FindSasl2.cmake | 13 | ||||
| -rw-r--r-- | modules/FindSqlite.cmake | 8 | ||||
| -rw-r--r-- | modules/FindUSB.cmake | 34 |
4 files changed, 24 insertions, 44 deletions
diff --git a/modules/FindSane.cmake b/modules/FindSane.cmake index 6c60cf63..64efa87a 100644 --- a/modules/FindSane.cmake +++ b/modules/FindSane.cmake @@ -9,20 +9,13 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (SANE_INCLUDE_DIR AND SANE_LIBRARY) - # Already in cache, be silent - set(Sane_FIND_QUIETLY TRUE) -endif (SANE_INCLUDE_DIR AND SANE_LIBRARY) - FIND_PATH(SANE_INCLUDE_DIR sane/sane.h) FIND_LIBRARY(SANE_LIBRARY NAMES sane libsane - PATHS - /usr/lib/sane - /usr/local/lib/sane + PATH_SUFFIXES sane ) -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sane DEFAULT_MSG SANE_INCLUDE_DIR SANE_LIBRARY ) +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sane DEFAULT_MSG SANE_LIBRARY SANE_INCLUDE_DIR ) MARK_AS_ADVANCED(SANE_INCLUDE_DIR SANE_LIBRARY) diff --git a/modules/FindSasl2.cmake b/modules/FindSasl2.cmake index 787b578c..9fe12ea2 100644 --- a/modules/FindSasl2.cmake +++ b/modules/FindSasl2.cmake @@ -11,21 +11,16 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (SASL2_INCLUDE_DIR) - # Already in cache, be silent - set(SASL2_FIND_QUIETLY TRUE) -endif (SASL2_INCLUDE_DIR) - -FIND_PATH(SASL2_INCLUDE_DIR sasl/sasl.h +find_path(SASL2_INCLUDE_DIR sasl/sasl.h ) # libsasl2 add for windows, because the windows package of cyrus-sasl2 # contains a libsasl2 also for msvc which is not standard conform -FIND_LIBRARY(SASL2_LIBRARIES NAMES sasl2 libsasl2 +find_library(SASL2_LIBRARIES NAMES sasl2 libsasl2 ) include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sasl2 DEFAULT_MSG SASL2_INCLUDE_DIR SASL2_LIBRARIES) +find_package_handle_standard_args(Sasl2 DEFAULT_MSG SASL2_LIBRARIES SASL2_INCLUDE_DIR) -MARK_AS_ADVANCED(SASL2_INCLUDE_DIR SASL2_LIBRARIES) +mark_as_advanced(SASL2_INCLUDE_DIR SASL2_LIBRARIES) diff --git a/modules/FindSqlite.cmake b/modules/FindSqlite.cmake index dc36457b..c4f2e90a 100644 --- a/modules/FindSqlite.cmake +++ b/modules/FindSqlite.cmake @@ -30,21 +30,21 @@ if( NOT WIN32 ) set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER}) endif( NOT WIN32 ) -FIND_PATH(SQLITE_INCLUDE_DIR NAMES sqlite3.h +find_path(SQLITE_INCLUDE_DIR NAMES sqlite3.h PATHS ${PC_SQLITE_INCLUDEDIR} ${PC_SQLITE_INCLUDE_DIRS} ) -FIND_LIBRARY(SQLITE_LIBRARIES NAMES sqlite3 +find_library(SQLITE_LIBRARIES NAMES sqlite3 PATHS ${PC_SQLITE_LIBDIR} ${PC_SQLITE_LIBRARY_DIRS} ) include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sqlite DEFAULT_MSG SQLITE_INCLUDE_DIR SQLITE_LIBRARIES ) +find_package_handle_standard_args(Sqlite DEFAULT_MSG SQLITE_INCLUDE_DIR SQLITE_LIBRARIES ) # show the SQLITE_INCLUDE_DIR and SQLITE_LIBRARIES variables only in the advanced view -MARK_AS_ADVANCED(SQLITE_INCLUDE_DIR SQLITE_LIBRARIES ) +mark_as_advanced(SQLITE_INCLUDE_DIR SQLITE_LIBRARIES ) diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index dfcf650c..f0178a3c 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -11,28 +11,20 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) +if (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + find_package(PkgConfig) + pkg_check_modules(PC_LIBUSB QUIET libusb) +endif(NOT WIN32) - # in cache already - set(LIBUSB_FOUND TRUE) +find_path(LIBUSB_INCLUDE_DIR usb.h + HINTS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) -else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) - IF (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - find_package(PkgConfig) - pkg_check_modules(PC_LIBUSB QUIET libusb) - ENDIF(NOT WIN32) +find_library(LIBUSB_LIBRARIES NAMES usb + HINTS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) - FIND_PATH(LIBUSB_INCLUDE_DIR usb.h - PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) - FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb - PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) - - include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) - - MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) - -endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) +mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES) |