diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-09 19:01:39 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-09 19:01:39 -0300 |
| commit | 00a27e8d6c410c980e7deb8603d4f765b0758500 (patch) | |
| tree | 0c722151dd51846798e9cee75cd11d8caaf9dd5e /tests/minimalbinding | |
| parent | 43c3b4e7e876ebc7a38f76b948337166bb6eb985 (diff) | |
| parent | bbb7d417e75043dec53c84ceafec5c07cc282a81 (diff) | |
Merge GeneratorRunner inside Shiboken.
Conflicts:
CMakeLists.txt
data/CMakeLists.txt
doc/CMakeLists.txt
doc/_templates/index.html
doc/_templates/layout.html
doc/_themes/pysidedocs/static/pysidedocs.css
doc/commandlineoptions.rst
doc/conf.py.in
doc/contents.rst
doc/images/bindinggen-development.png
doc/images/boostqtarch.png
tests/CMakeLists.txt
Diffstat (limited to 'tests/minimalbinding')
| -rw-r--r-- | tests/minimalbinding/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/minimalbinding/CMakeLists.txt b/tests/minimalbinding/CMakeLists.txt index 6229dd7cb..5522e6ad6 100644 --- a/tests/minimalbinding/CMakeLists.txt +++ b/tests/minimalbinding/CMakeLists.txt @@ -16,7 +16,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/minimal-binding.txt.in" "${CMAKE_CURRENT_BINARY_DIR}/minimal-binding.txt" @ONLY) add_custom_command(OUTPUT ${minimal_SRC} -COMMAND ${GENERATORRUNNER_BINARY} --project-file=${CMAKE_CURRENT_BINARY_DIR}/minimal-binding.txt ${GENERATOR_EXTRA_FLAGS} +COMMAND ${shibokengenerator_BINARY_DIR}/shiboken --project-file=${CMAKE_CURRENT_BINARY_DIR}/minimal-binding.txt ${GENERATOR_EXTRA_FLAGS} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Running generator for 'minimal' test binding..." ) @@ -36,5 +36,5 @@ target_link_libraries(minimal ${SBK_PYTHON_LIBRARIES} libshiboken) -add_dependencies(minimal shiboken_generator) +add_dependencies(minimal shiboken) |