summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2011-01-12 13:26:53 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2011-01-31 14:47:48 -0300
commit42597474323b837bcaf5486b4b342dd4d10739d8 (patch)
treed1c8080df61acead86667c3040f463a791692e76
parent47c7ea62996992d5e6b68f67c914f7d7bdf71864 (diff)
downloadshiboken-42597474323b837bcaf5486b4b342dd4d10739d8.tar.gz
shiboken-42597474323b837bcaf5486b4b342dd4d10739d8.tar.xz
shiboken-42597474323b837bcaf5486b4b342dd4d10739d8.zip
Shiboken executable calls GeneratorRunner with the renamed "--generator-set" argument.
-rw-r--r--generator/main.cpp2
-rw-r--r--tests/otherbinding/CMakeLists.txt3
-rw-r--r--tests/samplebinding/CMakeLists.txt4
3 files changed, 6 insertions, 3 deletions
diff --git a/generator/main.cpp b/generator/main.cpp
index 05122506..b2f2d37e 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 ebea9125..66e655c3 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 c22351f5..75069626 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}