diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-01-12 13:26:53 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:13:52 -0300 |
| commit | 799342ea7a00fdd698387e5b3438bd50002c4383 (patch) | |
| tree | 6ec86643c32d9992e1b57bc9dca58491b0f08a63 | |
| parent | 80b71b1cdba57c8e59c503494adbd04002d5026a (diff) | |
Shiboken executable calls GeneratorRunner with the renamed "--generator-set" argument.
| -rw-r--r-- | generator/main.cpp | 2 | ||||
| -rw-r--r-- | tests/otherbinding/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/samplebinding/CMakeLists.txt | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/generator/main.cpp b/generator/main.cpp index 051225061..b2f2d37ec 100644 --- a/generator/main.cpp +++ b/generator/main.cpp @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) { QStringList args; - args.append("--generatorSet=shiboken"); + args.append("--generator-set=shiboken"); for (int i = 1; i < argc; i++) args.append(argv[i]); return QProcess::execute("generatorrunner", args); diff --git a/tests/otherbinding/CMakeLists.txt b/tests/otherbinding/CMakeLists.txt index ebea91255..66e655c36 100644 --- a/tests/otherbinding/CMakeLists.txt +++ b/tests/otherbinding/CMakeLists.txt @@ -14,7 +14,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/other/other_module_wrapper.cpp ) add_custom_command(OUTPUT ${other_SRC} -COMMAND ${GENERATORRUNNER_BINARY} --generatorSet=${generators_BINARY_DIR}/shiboken_generator${CMAKE_RELEASE_POSTFIX}${CMAKE_DEBUG_POSTFIX} --enable-parent-ctor-heuristic +COMMAND ${GENERATORRUNNER_BINARY} --generator-set=${generators_BINARY_DIR}/shiboken_generator${CMAKE_RELEASE_POSTFIX}${CMAKE_DEBUG_POSTFIX} + --enable-parent-ctor-heuristic ${CMAKE_CURRENT_SOURCE_DIR}/global.h --include-paths=${libother_SOURCE_DIR}${PATH_SEP}${libsample_SOURCE_DIR}${PATH_SEP}${libsample_SOURCE_DIR}/.. --typesystem-paths=${CMAKE_CURRENT_SOURCE_DIR}${PATH_SEP}${sample_SOURCE_DIR} diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt index c22351f5b..75069626a 100644 --- a/tests/samplebinding/CMakeLists.txt +++ b/tests/samplebinding/CMakeLists.txt @@ -88,7 +88,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/valueandvirtual_wrapper.cpp ) add_custom_command(OUTPUT ${sample_SRC} -COMMAND ${GENERATORRUNNER_BINARY} --generatorSet=${generators_BINARY_DIR}/shiboken_generator${CMAKE_RELEASE_POSTFIX}${CMAKE_DEBUG_POSTFIX} --enable-parent-ctor-heuristic --use-isnull-as-nb_nonzero +COMMAND ${GENERATORRUNNER_BINARY} --generator-set=${generators_BINARY_DIR}/shiboken_generator${CMAKE_RELEASE_POSTFIX}${CMAKE_DEBUG_POSTFIX} + --enable-parent-ctor-heuristic + --use-isnull-as-nb_nonzero ${CMAKE_CURRENT_SOURCE_DIR}/global.h --include-paths=${libsample_SOURCE_DIR} --typesystem-paths=${CMAKE_CURRENT_SOURCE_DIR} |