jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated CMake files to use the "--drop-type-entries" generator option.

Browse source 
Instead of maintaining a complex CMake scheme to remove optional type
system entries, the generation will rely on the new generator capability
of dropping entries given via command line.

Reviewed by Bruno Araújo <bruno.araujo@openbossa.org>
Reviewed by Lauro Moura <lauro.neto@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
This commit is contained in:
Marcelo Lira 2011-02-16 11:37:45 -03:00
commit 5ef2f26ec2
42 changed files with 201 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

14
PySide/phonon/CMakeLists.txt
View file

@ -5,6 +5,10 @@ if (NOT QT_PHONON_INCLUDE_DIR AND CMAKE_HOST_APPLE)
set(QT_PHONON_INCLUDE_DIR "${QT_LIBRARY_DIR}/phonon.framework/Headers")
endif ()
set(phonon_OPTIONAL_SRC )
set(phonon_DROPPED_ENTRIES )
check_qt_class(phonon VideoCaptureDevice phonon_OPTIONAL_SRC phonon_DROPPED_ENTRIES Phonon ObjectDescription)
set(phonon_SRC
${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_abstractaudiooutput_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_abstractmediastream_wrapper.cpp
@ -42,14 +46,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_volumefaderinterface_wrapper.cp
${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_volumeslider_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_backendcapabilities_notifierwrapper_wrapper.cpp
${phonon_OPTIONAL_SRC}
)
set(TARGET_TYPESYSTEM "${CMAKE_CURRENT_BINARY_DIR}/typesystem_phonon.xml")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/typesystem_phonon.xml"
"${TARGET_TYPESYSTEM}" @ONLY)
check_qt_class("phonon" "VideoCaptureDevice" phonon_SRC ${TARGET_TYPESYSTEM} "Phonon" "ObjectDescription")
set(phonon_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${phonon_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
set(phonon_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${QT_QTCORE_INCLUDE_DIR}
@ -74,4 +73,5 @@ create_pyside_module(phonon
phonon_deps
phonon_typesystem_path
phonon_SRC
${TARGET_TYPESYSTEM})
""
phonon_DROPPED_ENTRIES)

5
PySide/phonon/optional/VideoCaptureDevice.xml
View file

@ -1,5 +0,0 @@
<value-type name="VideoCaptureDevice">
<modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
<modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
<modify-function signature="fromIndex(int)" remove="all"/>
</value-type>

11
PySide/phonon/typesystem_phonon.xml
View file

@ -231,6 +231,15 @@
</modify-argument>
</modify-function>
</object-type>
</namespace-type>
<!-- The following entries may be present in the system or not. Keep this section organized. -->
<value-type name="VideoCaptureDevice">
<modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
<modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
<modify-function signature="fromIndex(int)" remove="all"/>
</value-type>
<!-- The above entries may be present in the system or not. Keep this section organized. -->
</namespace-type>
</typesystem>