diff options
| author | Dirk Mueller <mueller@kde.org> | 2008-08-29 10:38:09 +0000 |
|---|---|---|
| committer | Dirk Mueller <mueller@kde.org> | 2008-08-29 10:38:09 +0000 |
| commit | c39c2245fe6429e2749a2a9d94d0cbf30b50f7ab (patch) | |
| tree | 94ec56b127350df42548c6f8075159c70e22a378 | |
| parent | d98faf5345e604b9e4631c8b2d6501c9bb06bdc2 (diff) | |
| download | extra-cmake-modules-c39c2245fe6429e2749a2a9d94d0cbf30b50f7ab.tar.gz extra-cmake-modules-c39c2245fe6429e2749a2a9d94d0cbf30b50f7ab.tar.bz2 | |
merge 850650 here
svn path=/trunk/KDE/kdelibs/; revision=854302
| -rw-r--r-- | modules/FindEigen2.cmake | 1 | ||||
| -rw-r--r-- | modules/MacroOptionalDependPackage.cmake | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/FindEigen2.cmake b/modules/FindEigen2.cmake index 59eb1dfc..7f6edf94 100644 --- a/modules/FindEigen2.cmake +++ b/modules/FindEigen2.cmake @@ -19,6 +19,7 @@ find_path(EIGEN2_INCLUDE_DIR NAMES Eigen/Core PATHS ${INCLUDE_INSTALL_DIR}/eigen2 ${KDE4_INCLUDE_DIR}/eigen2 + ${CMAKE_INCLUDE_PATH}/eigen2 ) include(FindPackageHandleStandardArgs) diff --git a/modules/MacroOptionalDependPackage.cmake b/modules/MacroOptionalDependPackage.cmake index 1a6df36a..fd82b567 100644 --- a/modules/MacroOptionalDependPackage.cmake +++ b/modules/MacroOptionalDependPackage.cmake @@ -13,10 +13,11 @@ MACRO (MACRO_OPTIONAL_DEPEND_PACKAGE _name _module_needed) set(_packagename Find${_name}.cmake) find_file(_PACKAGE_DEPEND_FOUND ${_packagename} PATHS ${CMAKE_MODULE_PATH} ) if(NOT _PACKAGE_DEPEND_FOUND) - MESSAGE(STATUS "cmake package ${_packagename} was not found. This package needs ${_module_needed} to be compile all program") - set(DEPEND_PACKAGE_${_name} FALSE) + MESSAGE(STATUS "cmake package ${_packagename} not found, optional dependency ${_module_needed}") + set(DEPEND_PACKAGE_${_name} FALSE) else(NOT _PACKAGE_DEPEND_FOUND) - set(DEPEND_PACKAGE_${_name} TRUE) + set(DEPEND_PACKAGE_${_name} TRUE) endif(NOT _PACKAGE_DEPEND_FOUND) + macro_log_feature(_PACKAGE_DEPEND_FOUND "${_packagename}" "${_module_needed}" "" FALSE "" "Optional dependency") ENDMACRO (MACRO_OPTIONAL_DEPEND_PACKAGE) |