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

Add typesystem path variable to execute_generator CMake macro.

Browse source
This commit is contained in:
Hugo Lima 2010-01-11 19:19:50 -02:00
commit ed108a7f00
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PySide/CMakeLists.txt
View file

@ -2,12 +2,12 @@ project(pyside)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/__init__.py" install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/__init__.py"
DESTINATION "${SITE_PACKAGE}/${BINDING_NAME}") DESTINATION "${SITE_PACKAGE}/${BINDING_NAME}")
macro(execute_generator module sources) macro(execute_generator module sources typesystem_path)
add_custom_command(OUTPUT ${${sources}} add_custom_command(OUTPUT ${${sources}}
COMMAND ${GENERATOR} ${GENERATOR_EXTRA_FLAGS} COMMAND ${GENERATOR} ${GENERATOR_EXTRA_FLAGS}
${CMAKE_CURRENT_SOURCE_DIR}/../global.h ${CMAKE_CURRENT_SOURCE_DIR}/../global.h
--include-paths=${QT_INCLUDE_DIR} --include-paths=${QT_INCLUDE_DIR}
--typesystem-paths=${pyside_SOURCE_DIR} --typesystem-paths=${pyside_SOURCE_DIR}:${typesystem_path}
--output-directory=${CMAKE_CURRENT_BINARY_DIR} --output-directory=${CMAKE_CURRENT_BINARY_DIR}
--license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt --license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt
${CMAKE_CURRENT_SOURCE_DIR}/typesystem_${module}.xml ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_${module}.xml

2
PySide/QtCore/CMakeLists.txt
View file

@ -99,7 +99,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamreader_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamwriter_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamwriter_wrapper.cpp
) )
execute_generator(core QtCore_SRC) execute_generator(core QtCore_SRC "")
include_directories(${CMAKE_CURRENT_SOURCE_DIR} include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/ ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/