cmake: Don't use tabs and generate revision.c builtin.h vlc_about.h in the build...

diff --git a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
index 4d675d0736d2b66a8ca1a92d131336ea618199d0..66804d50bb59c37ade82344bac421ee1cecc8e0d 100644 (file)
--- a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
+++ b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
@@ -20,111 +20,111 @@ set( SOURCES_libvlc_dirent extras/dirent.c )
 set( SOURCES_libvlc_getopt misc/getopt.c misc/getopt.h misc/getopt1.c )
 set( SOURCES_libvlc_common
     libvlc.c
-       libvlc-common.c
-       libvlc.h
-       libvlc-module.c
-       interface/interface.h
-       interface/interface.c
-       interface/intf_eject.c
-       interface/interaction.c
-       playlist/playlist_internal.h
-       playlist/thread.c
-       playlist/control.c
-       playlist/engine.c
-       playlist/sort.c
-       playlist/loadsave.c
-       playlist/tree.c
-       playlist/item.c
-       playlist/search.c
-       playlist/services_discovery.c
-       input/item.c
-       input/access.c
-       input/clock.c
-       input/control.c
-       input/decoder.c
-       input/decoder_synchro.c
-       input/demux.c
-       input/es_out.c
-       input/input.c
-       input/meta.c
-       input/input_internal.h
-       input/vlm_internal.h
-       input/stream.c
-       input/mem_stream.c
-       input/subtitles.c
-       input/var.c
-       video_output/video_output.c
-       video_output/vout_pictures.c
-       video_output/vout_pictures.h
-       video_output/video_text.c
-       video_output/video_widgets.c
-       video_output/vout_subpictures.c
-       video_output/vout_intf.c
-       audio_output/aout_internal.h
-       audio_output/common.c
-       audio_output/dec.c
-       audio_output/filters.c
-       audio_output/input.c
-       audio_output/mixer.c
-       audio_output/output.c
-       audio_output/intf.c
-       stream_output/stream_output.c
-       stream_output/stream_output.h
-       stream_output/announce.c
-       stream_output/profiles.c
-       stream_output/sap.c
-       stream_output/sdp.c
-       osd/osd.c
-       osd/osd_text.c
-       osd/osd_widgets.c
-       network/acl.c
-       network/getaddrinfo.c
-       network/io.c
-       network/error.c
-       network/tcp.c
-       network/udp.c
-       network/httpd.c
-       network/rootwrap.c
-       network/tls.c
-       network/poll.c
-       text/charset.c
-       text/strings.c
-       text/unicode.c
-       text/wincp.c
-       text/iso_lang.c
-       text/iso-639_def.h
-       misc/md5.c
-       misc/rand.c
-       misc/mtime.c
-       misc/block.c
-       modules/builtin.h
-       modules/modules.h
-       modules/modules.c
-       modules/cache.c
-       modules/entry.c
-       modules/os.c
-       misc/threads.c
-       misc/stats.c
-       misc/cpu.c
-       config/configuration.h
-       config/core.c
-       config/chain.c
-       config/file.c
-       config/cmdline.c
-       misc/events.c
-       misc/image.c
-       misc/messages.c
-       misc/objects.c
-       misc/variables.h
-       misc/variables.c
-       misc/error.c
-       misc/update.c
-       misc/revision.c
-       input/vlm.c
-       misc/xml.c
-       misc/devices.c
-       extras/libc.c
-    ${CMAKE_SOURCE_DIR}/include/vlc_about.h )
+    libvlc-common.c
+    libvlc.h
+    libvlc-module.c
+    interface/interface.h
+    interface/interface.c
+    interface/intf_eject.c
+    interface/interaction.c
+    playlist/playlist_internal.h
+    playlist/thread.c
+    playlist/control.c
+    playlist/engine.c
+    playlist/sort.c
+    playlist/loadsave.c
+    playlist/tree.c
+    playlist/item.c
+    playlist/search.c
+    playlist/services_discovery.c
+    input/item.c
+    input/access.c
+    input/clock.c
+    input/control.c
+    input/decoder.c
+    input/decoder_synchro.c
+    input/demux.c
+    input/es_out.c
+    input/input.c
+    input/meta.c
+    input/input_internal.h
+    input/vlm_internal.h
+    input/stream.c
+    input/mem_stream.c
+    input/subtitles.c
+    input/var.c
+    video_output/video_output.c
+    video_output/vout_pictures.c
+    video_output/vout_pictures.h
+    video_output/video_text.c
+    video_output/video_widgets.c
+    video_output/vout_subpictures.c
+    video_output/vout_intf.c
+    audio_output/aout_internal.h
+    audio_output/common.c
+    audio_output/dec.c
+    audio_output/filters.c
+    audio_output/input.c
+    audio_output/mixer.c
+    audio_output/output.c
+    audio_output/intf.c
+    stream_output/stream_output.c
+    stream_output/stream_output.h
+    stream_output/announce.c
+    stream_output/profiles.c
+    stream_output/sap.c
+    stream_output/sdp.c
+    osd/osd.c
+    osd/osd_text.c
+    osd/osd_widgets.c
+    network/acl.c
+    network/getaddrinfo.c
+    network/io.c
+    network/error.c
+    network/tcp.c
+    network/udp.c
+    network/httpd.c
+    network/rootwrap.c
+    network/tls.c
+    network/poll.c
+    text/charset.c
+    text/strings.c
+    text/unicode.c
+    text/wincp.c
+    text/iso_lang.c
+    text/iso-639_def.h
+    misc/md5.c
+    misc/rand.c
+    misc/mtime.c
+    misc/block.c
+    ${CMAKE_BINARY_DIR}/src/modules/builtin.h
+    modules/modules.h
+    modules/modules.c
+    modules/cache.c
+    modules/entry.c
+    modules/os.c
+    misc/threads.c
+    misc/stats.c
+    misc/cpu.c
+    config/configuration.h
+    config/core.c
+    config/chain.c
+    config/file.c
+    config/cmdline.c
+    misc/events.c
+    misc/image.c
+    misc/messages.c
+    misc/objects.c
+    misc/variables.h
+    misc/variables.c
+    misc/error.c
+    misc/update.c
+    ${CMAKE_BINARY_DIR}/src/misc/revision.c
+    input/vlm.c
+    misc/xml.c
+    misc/devices.c
+    extras/libc.c
+    ${CMAKE_BINARY_DIR}/include/vlc_about.h )
 
 set( SOURCES_libvlc ${SOURCES_libvlc_common} )
 
@@ -182,15 +182,16 @@ endif(APPLE)
 ##########################################################
 # revision.c
 
-set(rev "${CMAKE_CURRENT_SOURCE_DIR}/misc/revision.c")
+set(rev "${CMAKE_BINARY_DIR}/src/misc/revision.c")
 add_custom_command(
 OUTPUT ${rev}
-COMMAND        rm -f ${rev} ${rev}.tmp
-COMMAND        echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > ${rev}.tmp
-COMMAND        printf "const char psz_vlc_changeset[] = \"" >> ${rev}.tmp
-COMMAND        sh -c "printf `LANG=C svnversion ${CMAKE_SOURCE_DIR} || printf \"exported\"`" >> ${rev}.tmp
-COMMAND        echo "\";" >> ${rev}.tmp
-COMMAND        mv -f ${rev}.tmp ${rev}
+COMMAND    rm -f ${rev} ${rev}.tmp
+COMMAND    mkdir -p `dirname ${rev}`
+COMMAND    echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > ${rev}.tmp
+COMMAND    printf "const char psz_vlc_changeset[] = \"" >> ${rev}.tmp
+COMMAND    sh -c "printf `LANG=C svnversion ${CMAKE_SOURCE_DIR} || printf \"exported\"`" >> ${rev}.tmp
+COMMAND    echo "\";" >> ${rev}.tmp
+COMMAND    mv -f ${rev}.tmp ${rev}
 VERBATIM
 )
 set(rev)
@@ -199,24 +200,26 @@ set(rev)
 # builtin.h
 # No real use for this one, we just used to need it.
 # We should really remove that.
-set(builtin "${CMAKE_CURRENT_SOURCE_DIR}/modules/builtin.h")
+set(builtin "${CMAKE_BINARY_DIR}/src/modules/builtin.h")
 
 add_custom_command(
 OUTPUT ${builtin}
-COMMAND        echo "/* Auto generated by ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt */" > ${builtin}
-COMMAND        echo "int vlc_entry__main( module_t* );" >> ${builtin}
-COMMAND        echo "#define ALLOCATE_ALL_BUILTINS() do {} while(0)" >> ${builtin}
+COMMAND    mkdir -p `dirname ${builtin}`
+COMMAND    echo "/* Auto generated by ${CMAKE_CURRENT_BUILD_DIR}/CMakeLists.txt */" > ${builtin}
+COMMAND    echo "int vlc_entry__main( module_t* );" >> ${builtin}
+COMMAND    echo "#define ALLOCATE_ALL_BUILTINS() do {} while(0)" >> ${builtin}
 VERBATIM
 )
 set(should)
 
 ##########################################################
 # vlc_about.h
-set(about "${CMAKE_SOURCE_DIR}/include/vlc_about.h")
+set(about "${CMAKE_BINARY_DIR}/include/vlc_about.h")
 
 add_custom_command(
 OUTPUT ${about}
 COMMAND rm -f -- "${about}.tmp"
+COMMAND    mkdir -p `dirname ${about}`
 COMMAND mkdir -p -- ../include
 COMMAND echo "/* Automatically generated file - DO NOT EDIT */" > "${about}.tmp"
 COMMAND echo "static const char psz_license[] =" >> "${about}.tmp"
@@ -249,4 +252,4 @@ set_target_properties(libvlc PROPERTIES SOVERSION 1.0.0)
 set_target_properties(libvlc libvlc-control PROPERTIES PREFIX "")
 set_target_properties(libvlc libvlc-control PROPERTIES LINK_FLAGS "${LINK_FLAGS} ${CMAKE_THREAD_LIBS_INIT}")
 set_target_properties(libvlc libvlc-control vlc PROPERTIES COMPILE_FLAGS
-    "-Wall -Wextra -Wsign-compare -Wundef -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wmissing-prototypes" )
+    "-Wall -Wextra -Wsign-compare -Wundef -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wmissing-prototypes -I${CMAKE_BINARY_DIR}/src -I${CMAKE_BINARY_DIR}/include" )