Changeset f03c892c22462ce8261937e0fe16739dc1b8ace9

Timestamp:

02/21/08 01:10:29 (7 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1203552629 +0000

git-parent:

[5fb9f95ef61bf58671090a0a3772f0cd9f420dc5]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1203552629 +0000

Message:

cmake: Fix qt4 linking and moc.

Files:

• extras/buildsystem/cmake/CMakeLists/qt4_CMakeLists.txt (modified) (1 diff)
• extras/buildsystem/cmake/include/config.cmake (modified) (3 diffs)
• extras/buildsystem/cmake/include/vlc_module_funcs.cmake (modified) (2 diffs)

extras/buildsystem/cmake/CMakeLists/qt4_CMakeLists.txt

@@ -1 +1 @@
-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 ) 
-
+
-if(QT4_FOUND)
-    include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
+
+
-    vlc_qt4_wrap_ui(qt4_UIS_H ${qt4_UIS})
-endif(QT4_FOUND)
-vlc_add_module(qt4 ${qt4_SOURCES} ${qt4_UIS_H})
-
+vlc_add_module(qt4 ${qt4_SOURCES} ${qt4_MOCS} ${qt4_UIS})
+

extras/buildsystem/cmake/include/config.cmake

@@ -435 +435 @@
-  vlc_enable_modules(qt4)
-  vlc_add_module_compile_flag(qt4 ${QT_CFLAGS} )
-LIBRARIES
+QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY
-
-  # Define our own qt4_wrap_ui macro to match wanted behaviour
@@ -452 +452 @@
-  ENDMACRO (VLC_QT4_WRAP_UI)
-
+  MACRO (VLC_QT4_GENERATE_MOC outfiles flags )
+    FOREACH (it ${ARGN})
+     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)
+      SET(${outfiles} ${${outfiles}} ${outfile})
+    ENDFOREACH (it)
+  ENDMACRO (VLC_QT4_GENERATE_MOC)
+
+
-endif(QT4_FOUND)
-
@@ -515 +531 @@
-# Final configuration
-###########################################################
+add_definitions(-DHAVE_CONFIG_H)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)

extras/buildsystem/cmake/include/vlc_module_funcs.cmake

@@ -7 +7 @@
-            vlc_module_add_link_libraries( ${module_name} libvlc )
-        endif( NOT ${ENABLE_NO_SYMBOL_CHECK} )
-
-
+
+
+
-        set_target_properties( ${module_name}_plugin PROPERTIES LINK_FLAGS "${VLC_${module_name}_LINK_FLAGS}" )
-        if (VLC_${module_name}_LINK_LIBRARIES)
@@ -16 +17 @@
-    endif(ENABLE_VLC_MODULE_${module_name})
-ENDMACRO(vlc_add_module)
+
+MACRO(vlc_get_module_compile_flags var module_name)
+    set(${var} "-D__PLUGIN__ -DMODULE_NAME=${module_name} -DMODULE_NAME_IS_${module_name} -I${CMAKE_CURRENT_SOURCE_DIR} ${VLC_${module_name}_COMPILE_FLAG}")
+ENDMACRO(vlc_get_module_compile_flags)
-
-MACRO(vlc_register_modules module_state)