[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/phonon/cmake
From:       David Faure <faure () kde ! org>
Date:       2008-06-04 22:09:00
Message-ID: 1212617340.147812.5992.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 816900 by dfaure:

Same as SVN commit r815981 by neundorf: search in more directories (i.e. allow me to \
set CMAKE_PREFIX_PATH to kdesupport's prefix)


 M  +8 -1      FindAutomoc4.cmake  


--- trunk/kdesupport/phonon/cmake/FindAutomoc4.cmake #816899:816900
@@ -23,9 +23,16 @@
    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}")
 


[prev in list] [next in list] [prev in thread] [next in thread]