diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-06-02 23:03:30 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-06-02 23:03:30 +0000 |
| commit | e13e219d9a24e4379bcf80c40e55ab89359fbcc9 (patch) | |
| tree | 462dd75a8ee5592085b42ade611d221596a2a712 | |
| parent | 8c2534ec35c9da2a00dc2d0dae8f7fa0d71d2ea5 (diff) | |
| download | extra-cmake-modules-e13e219d9a24e4379bcf80c40e55ab89359fbcc9.tar.gz extra-cmake-modules-e13e219d9a24e4379bcf80c40e55ab89359fbcc9.tar.bz2 | |
-search in more directories
Alex
CCMAIL: faure@kde.org
svn path=/trunk/KDE/kdelibs/; revision=815981
| -rw-r--r-- | modules/FindAutomoc4.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/modules/FindAutomoc4.cmake b/modules/FindAutomoc4.cmake index 03a90974..6052d2c5 100644 --- a/modules/FindAutomoc4.cmake +++ b/modules/FindAutomoc4.cmake @@ -23,9 +23,16 @@ if("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") set(AUTOMOC4_CONFIG_FILE "${KDESupport_SOURCE_DIR}/automoc/Automoc4Config.cmake") else("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") # when building this project outside kdesupport + + # CMAKE_[SYSTEM_]PREFIX_PATH exists starting with cmake 2.6.0 + file(TO_CMAKE_PATH "$ENV{CMAKE_PREFIX_PATH}" _env_CMAKE_PREFIX_PATH) + file(TO_CMAKE_PATH "$ENV{CMAKE_LIBRARY_PATH}" _env_CMAKE_LIBRARY_PATH) + find_file(AUTOMOC4_CONFIG_FILE NAMES Automoc4Config.cmake PATH_SUFFIXES automoc4 lib/automoc4 lib64/automoc4 - PATHS ${CMAKE_SYSTEM_PREFIX_PATH} ${CMAKE_SYSTEM_LIBRARY_PATH} ${CMAKE_INSTALL_PREFIX}/lib + PATHS ${_env_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH} ${CMAKE_SYSTEM_PREFIX_PATH} + ${_env_CMAKE_LIBRARY_PATH} ${CMAKE_LIBRARY_PATH} ${CMAKE_SYSTEM_LIBRARY_PATH} + ${CMAKE_INSTALL_PREFIX}/lib NO_DEFAULT_PATH ) endif("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") |