Commit 1c6353ad authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files

cmake: .moc.cpp compilation fixes.

parent ce87acac
set(qt4_SOURCES qt4.cpp menus.cpp main_interface.cpp dialogs_provider.cpp input_manager.cpp dialogs/playlist.cpp dialogs/bookmarks.cpp dialogs/preferences.cpp dialogs/mediainfo.cpp dialogs/extended.cpp dialogs/messages.cpp dialogs/errors.cpp dialogs/interaction.cpp dialogs/sout.cpp dialogs/help.cpp dialogs/gototime.cpp dialogs/open.cpp dialogs/vlm.cpp dialogs/podcast_configuration.cpp components/extended_panels.cpp components/info_panels.cpp components/preferences_widgets.cpp components/complete_preferences.cpp components/simple_preferences.cpp components/open_panels.cpp components/interface_widgets.cpp components/playlist/playlist_model.cpp components/playlist/playlist_item.cpp components/playlist/standardpanel.cpp components/playlist/playlist.cpp components/playlist/selector.cpp util/input_slider.cpp util/customwidgets.cpp util/registry.cpp )
set(qt4_UIS ui/equalizer.ui ui/v4l2.ui ui/video_effects.ui ui/open_file.ui ui/open_disk.ui ui/open_net.ui ui/open_capture.ui ui/open.ui ui/podcast_configuration.ui ui/sprefs_audio.ui ui/sprefs_input.ui ui/sprefs_interface.ui ui/sprefs_subtitles.ui ui/sprefs_video.ui ui/streampanel.ui ui/sout.ui ui/vlm.ui )
set(qt4_HEADERS menus.hpp main_interface.hpp dialogs_provider.hpp input_manager.hpp dialogs/playlist.hpp dialogs/bookmarks.hpp dialogs/mediainfo.hpp dialogs/extended.hpp dialogs/messages.hpp dialogs/errors.hpp dialogs/preferences.hpp dialogs/interaction.hpp dialogs/sout.hpp dialogs/help.hpp dialogs/gototime.hpp dialogs/open.hpp dialogs/vlm.hpp dialogs/podcast_configuration.hpp components/extended_panels.hpp components/info_panels.hpp components/preferences_widgets.hpp components/complete_preferences.hpp components/simple_preferences.hpp components/open_panels.hpp components/interface_widgets.hpp components/playlist/playlist_model.hpp components/playlist/playlist_item.hpp components/playlist/panels.hpp components/playlist/selector.hpp util/input_slider.hpp util/customwidgets.hpp util/qvlcframe.hpp util/registry.hpp )
set(qt4_HEADERS
components/complete_preferences.hpp
components/extended_panels.hpp
components/info_panels.hpp
components/interface_widgets.hpp
components/open_panels.hpp
components/playlist/panels.hpp
components/playlist/playlist.hpp
components/playlist/playlist_item.hpp
components/playlist/playlist_model.hpp
components/playlist/selector.hpp
components/preferences_widgets.hpp
components/simple_preferences.hpp
dialogs/bookmarks.hpp
dialogs/errors.hpp
dialogs/extended.hpp
dialogs/gototime.hpp
dialogs/help.hpp
dialogs/interaction.hpp
dialogs/mediainfo.hpp
dialogs/messages.hpp
dialogs/open.hpp
dialogs/playlist.hpp
dialogs/podcast_configuration.hpp
dialogs/preferences.hpp
dialogs/sout.hpp
dialogs/vlm.hpp
dialogs_provider.hpp
input_manager.hpp
main_interface.hpp
menus.hpp
qt4.hpp
util/customwidgets.hpp
util/input_slider.hpp
util/qvlcframe.hpp
util/registry.hpp
)
if(QT4_FOUND)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
vlc_get_module_compile_flags( MOC_FLAGS qt4 )
vlc_qt4_generate_moc(qt4_MOCS "${MOC_FLAGS}" ${qt4_HEADERS})
set(MOC_FLAGS "-DHAVE_CONFIG_H ${MOC_FLAGS}")
vlc_qt4_generate_moc(qt4_MOCS ${MOC_FLAGS} ${qt4_HEADERS})
vlc_qt4_wrap_ui(qt4_UIS_H ${qt4_UIS})
endif(QT4_FOUND)
......
......@@ -456,16 +456,19 @@ if(QT4_FOUND)
ENDMACRO (VLC_QT4_WRAP_UI)
MACRO (VLC_QT4_GENERATE_MOC outfiles flags )
string(REGEX MATCHALL "[^\\ ]+" flags_list ${flags})
FOREACH (it ${ARGN})
string(REPLACE ".hpp" ".moc.cpp" outfile "${it}")
string(REPLACE ".hpp" ".moc.cpp" outfile "${it}")
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile})
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND mkdir -p `dirname ${outfile}`
COMMAND ${QT_MOC_EXECUTABLE}
ARGS ${flags} -f -o ${outfile} ${infile}
MAIN_DEPENDENCY ${infile}
VERBATIM)
COMMAND ${QT_MOC_EXECUTABLE}
ARGS ${flags_list}
ARGS -I ${CMAKE_BINARY_DIR}/include
ARGS -o ${outfile} ${infile}
MAIN_DEPENDENCY ${it}
)
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH (it)
ENDMACRO (VLC_QT4_GENERATE_MOC)
......@@ -534,5 +537,4 @@ set(CMAKE_REQUIRED_INCLUDES)
###########################################################
# Final configuration
###########################################################
add_definitions(-DHAVE_CONFIG_H)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
......@@ -7,7 +7,7 @@ MACRO(vlc_add_module module_name)
vlc_module_add_link_libraries( ${module_name} libvlc )
endif( NOT ${ENABLE_NO_SYMBOL_CHECK} )
vlc_get_module_compile_flags(compile_flags ${module_name})
set_target_properties( ${module_name}_plugin PROPERTIES COMPILE_FLAGS
set_target_properties( ${module_name}_plugin PROPERTIES COMPILE_FLAGS
"${compile_flags}" )
set_target_properties( ${module_name}_plugin PROPERTIES LINK_FLAGS "${VLC_${module_name}_LINK_FLAGS}" )
if (VLC_${module_name}_LINK_LIBRARIES)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment