← Back to branch summary

~compiz-team/compiz-core/compiz-core.gsettings-schemas

« back to all changes in this revision

Viewing changes to cmake/CompizCommon.cmake

  • Committer: Sam Spilsbury
  • Date: 2011-07-13 17:29:00 UTC
  • Revision ID: git-v1:7993fb5ea29da78dc74d353e231de6a85528db38
Fix for bad merge, unbreak plugin build

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmake/CompizCommon.cmake
318
318
                endif (NOT (${GEN_GIT_LOG} STREQUAL "GEN_GIT_LOG-NOTFOUND"))
319
319
 
320
320
                if (AUTO_NEWS_UPDATE)
321
 
                        add_custom_target (news-header echo 'Release ${VERSION} ('`date +%Y-%m-%d`' '`git config user.name`' <'`git config user.email`'>)' > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update
322
 
                                           COMMAND echo "${AUTO_NEWS_UPDATE}" >> ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update
 
321
                        add_custom_target (news-header echo > ${CMAKE_BINARY_DIR}/NEWS.update
 
322
                                           COMMAND echo 'Release ${VERSION} ('`date +%Y-%m-%d`' '`git config user.name`' <'`git config user.email`'>)' > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo '${AUTO_NEWS_UPDATE}' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update
323
323
                                           COMMENT "Generating NEWS Header"
324
324
                                           WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
325
325
                else (AUTO_NEWS_UPDATE)
326
 
                        add_custom_target (news-header echo 'Release ${VERSION} ('`date +%Y-%m-%d`' '`git config user.name`' <'`git config user.email`'>)' > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update
327
 
                                           COMMAND $ENV{EDITOR} ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update
 
326
                        add_custom_target (news-header echo > ${CMAKE_BINARY_DIR}/NEWS.update
 
327
                                           COMMAND echo 'Release ${VERSION} ('`date +%Y-%m-%d`' '`git config user.name`' <'`git config user.email`'>)' > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update && $ENV{EDITOR} ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update
328
328
                                           COMMENT "Generating NEWS Header"
329
329
                                           WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
330
330
                endif (AUTO_NEWS_UPDATE)
339
339
                                           COMMENT "Generating ChangeLog")
340
340
 
341
341
                        if (AUTO_NEWS_UPDATE)
 
342
                                message ("running echo 'Release ${VERSION} ('`date +%Y-%m-%d`' '`bzr config email`')' > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo '${AUTO_NEWS_UPDATE}' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update")
342
343
                                add_custom_target (news-header echo > ${CMAKE_BINARY_DIR}/NEWS.update
343
344
                                                   COMMAND echo 'Release ${VERSION} ('`date +%Y-%m-%d`' '`bzr config email`')' > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo '${AUTO_NEWS_UPDATE}' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update
344
345
                                                   COMMENT "Generating NEWS Header"