diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindBlueZ.cmake | 10 | ||||
| -rw-r--r-- | modules/FindEigen.cmake | 9 | ||||
| -rw-r--r-- | modules/FindFAM.cmake | 7 | ||||
| -rw-r--r-- | modules/FindFontconfig.cmake | 4 |
4 files changed, 8 insertions, 22 deletions
diff --git a/modules/FindBlueZ.cmake b/modules/FindBlueZ.cmake index 8332797f..b1577d31 100644 --- a/modules/FindBlueZ.cmake +++ b/modules/FindBlueZ.cmake @@ -17,7 +17,7 @@ if ( BLUEZ_INCLUDE_DIR AND BLUEZ_LIBRARIES ) # in cache already - SET(BlueZ_FIND_QUIETLY TRUE) + set(BlueZ_FIND_QUIETLY TRUE) endif ( BLUEZ_INCLUDE_DIR AND BLUEZ_LIBRARIES ) # use pkg-config to get the directories and then use these values @@ -30,22 +30,22 @@ if( NOT WIN32 ) set(BLUEZ_DEFINITIONS ${PC_BLUEZ_CFLAGS_OTHER}) endif( NOT WIN32 ) -FIND_PATH(BLUEZ_INCLUDE_DIR NAMES bluetooth/bluetooth.h +find_path(BLUEZ_INCLUDE_DIR NAMES bluetooth/bluetooth.h PATHS ${PC_BLUEZ_INCLUDEDIR} ${PC_BLUEZ_INCLUDE_DIRS} /usr/X11/include ) -FIND_LIBRARY(BLUEZ_LIBRARIES NAMES bluetooth +find_library(BLUEZ_LIBRARIES NAMES bluetooth PATHS ${PC_BLUEZ_LIBDIR} ${PC_BLUEZ_LIBRARY_DIRS} ) include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(BlueZ DEFAULT_MSG BLUEZ_INCLUDE_DIR BLUEZ_LIBRARIES ) +find_package_handle_standard_args(BlueZ DEFAULT_MSG BLUEZ_INCLUDE_DIR BLUEZ_LIBRARIES ) # show the BLUEZ_INCLUDE_DIR and BLUEZ_LIBRARIES variables only in the advanced view -MARK_AS_ADVANCED(BLUEZ_INCLUDE_DIR BLUEZ_LIBRARIES ) +mark_as_advanced(BLUEZ_INCLUDE_DIR BLUEZ_LIBRARIES ) diff --git a/modules/FindEigen.cmake b/modules/FindEigen.cmake index c65cb8dc..805deb2d 100644 --- a/modules/FindEigen.cmake +++ b/modules/FindEigen.cmake @@ -11,13 +11,6 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (EIGEN_INCLUDE_DIR) - - # in cache already - set(EIGEN_FOUND TRUE) - -else (EIGEN_INCLUDE_DIR) - find_path(EIGEN_INCLUDE_DIR NAMES eigen/matrix.h PATHS ${INCLUDE_INSTALL_DIR} @@ -26,8 +19,6 @@ find_path(EIGEN_INCLUDE_DIR NAMES eigen/matrix.h include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Eigen DEFAULT_MSG EIGEN_INCLUDE_DIR ) - mark_as_advanced(EIGEN_INCLUDE_DIR) -endif(EIGEN_INCLUDE_DIR) diff --git a/modules/FindFAM.cmake b/modules/FindFAM.cmake index 8ebb3ab6..7a598fd0 100644 --- a/modules/FindFAM.cmake +++ b/modules/FindFAM.cmake @@ -11,16 +11,11 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (FAM_INCLUDE_DIR) - # Already in cache, be silent - set(FAM_FIND_QUIETLY TRUE) -endif (FAM_INCLUDE_DIR) - FIND_PATH(FAM_INCLUDE_DIR fam.h) FIND_LIBRARY(FAM_LIBRARIES NAMES fam ) -include(FindPackageHandleStandardArgs) +INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(FAM DEFAULT_MSG FAM_INCLUDE_DIR FAM_LIBRARIES ) MARK_AS_ADVANCED(FAM_INCLUDE_DIR FAM_LIBRARIES) diff --git a/modules/FindFontconfig.cmake b/modules/FindFontconfig.cmake index 5e2f3ead..d95e46b4 100644 --- a/modules/FindFontconfig.cmake +++ b/modules/FindFontconfig.cmake @@ -42,8 +42,8 @@ else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) ) include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fontconfig DEFAULT_MSG FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR ) - + find_package_handle_standard_args(Fontconfig DEFAULT_MSG FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR ) + mark_as_advanced(FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR) endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) |