Changeset 6ef4eb5e969fa1aa3f593cfbe59fcfd6b3fcf053

Show
Ignore:
Timestamp:
08/02/08 17:36:20 (10 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1202488580 +0000
git-parent:

[7185386d8ee536aa912a322d16a9ddadcd89c5e4]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1202488580 +0000
Message:

cmake: Correctly build qt4.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/buildsystem/cmake/include/config.cmake

    rabe53d9 r6ef4eb5  
    399399  vlc_enable_modules(qt4) 
    400400  vlc_add_module_compile_flag(qt4 ${QT_CFLAGS} ) 
    401   vlc_module_add_link_libraries(qt4 ${QT_LIBRARIES} Qt4) 
     401  vlc_module_add_link_libraries(qt4 ${QT_LIBRARIES}) 
     402  # Define our own qt4_wrap_ui macro to match wanted behaviour 
     403  MACRO (VLC_QT4_WRAP_UI outfiles ) 
     404    FOREACH (it ${ARGN}) 
     405     string(REPLACE ".ui" ".h" outfile "${it}") 
     406      GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) 
     407      SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile}) 
     408      ADD_CUSTOM_COMMAND(OUTPUT ${outfile} 
     409        COMMAND mkdir -p `dirname ${outfile}` 
     410        COMMAND ${QT_UIC_EXECUTABLE} 
     411        ARGS -o ${outfile} ${infile} 
     412        MAIN_DEPENDENCY ${infile}) 
     413      SET(${outfiles} ${${outfiles}} ${outfile}) 
     414    ENDFOREACH (it) 
     415 
     416  ENDMACRO (VLC_QT4_WRAP_UI) 
     417 
    402418endif(QT4_FOUND) 
    403419 

  • extras/buildsystem/cmake/scripts/convert_vlc_to_cmake.sh

    r4ab2d13 r6ef4eb5  
    2020ln -s ../$cmake_dir/CMakeLists/modules_CMakeLists.txt modules/CMakeLists.txt 
    2121 
     22echo "Installing modules/gui/qt4/CMakeLists.txt" 
     23ln -s ../../../$cmake_dir/CMakeLists/qt4_CMakeLists.txt modules/gui/qt4/CMakeLists.txt 
     24 
    2225echo "Installing po/CMakeLists.txt" 
    2326ln -s ../$cmake_dir/CMakeLists/po_CMakeLists.txt po/CMakeLists.txt