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

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Benjamin Reed <ranger () befunk ! com>
Date:       2009-06-02 21:23:44
Message-ID: 1243977824.345942.17024.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 976876 by reed:

it helps to check in the right file when editing in 2 different places  :P

 M  +4 -4      FindPhonon.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindPhonon.cmake #976875:976876
@@ -13,10 +13,10 @@
 
 macro(_phonon_find_version)
    set(_phonon_namespace_header_file \
                "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h")
-   if (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phonon/phononnamespace.h")
-      set(_phonon_namespace_header_file \
                "${PHONON_INCLUDE_DIR}/Headers/phonon/phononnamespace.h")
-   endif (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phonon/phononnamespace.h")
-   file(READ _phonon_namespace_header_file _phonon_header LIMIT 5000 OFFSET 1000)
+   if (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
+      set(_phonon_namespace_header_file \
"${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h") +   endif (APPLE AND EXISTS \
"${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h") +   file(READ \
${_phonon_namespace_header_file} _phonon_header LIMIT 5000 OFFSET 1000)  string(REGEX \
MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match \
"${_phonon_header}")  set(PHONON_VERSION "${CMAKE_MATCH_1}")
    message(STATUS "Phonon Version: ${PHONON_VERSION}")


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