summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2011-01-17 18:32:12 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2011-01-31 14:47:48 -0300
commit4c682d6121b5fa31c54655cb119d75e39d957ce1 (patch)
treedcf679f92c15b972bc9bcf026fdc0c43fbd98bc8 /tests
parentcf352ecf7f7414f57ee84fc020b5a27e6d021917 (diff)
downloadshiboken-4c682d6121b5fa31c54655cb119d75e39d957ce1.tar.gz
shiboken-4c682d6121b5fa31c54655cb119d75e39d957ce1.tar.xz
shiboken-4c682d6121b5fa31c54655cb119d75e39d957ce1.zip
Shiboken binary now responds to the "--version" argument.
The version command line argument was previously answered by GeneratorRunner. This commit also generally updates some CMake files.
Diffstat (limited to 'tests')
-rw-r--r--tests/otherbinding/CMakeLists.txt3
-rw-r--r--tests/samplebinding/CMakeLists.txt3
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/otherbinding/CMakeLists.txt b/tests/otherbinding/CMakeLists.txt
index 66e655c3..9b14fae4 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} --generator-set=${generators_BINARY_DIR}/shiboken_generator${CMAKE_RELEASE_POSTFIX}${CMAKE_DEBUG_POSTFIX}
+COMMAND ${GENERATORRUNNER_BINARY}
+ --generator-set=${generators_BINARY_DIR}/shiboken_generator${CMAKE_RELEASE_POSTFIX}${CMAKE_DEBUG_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}
--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}/..
diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt
index 75069626..2c2623d6 100644
--- a/tests/samplebinding/CMakeLists.txt
+++ b/tests/samplebinding/CMakeLists.txt
@@ -88,7 +88,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/valueandvirtual_wrapper.cpp
)
add_custom_command(OUTPUT ${sample_SRC}
-COMMAND ${GENERATORRUNNER_BINARY} --generator-set=${generators_BINARY_DIR}/shiboken_generator${CMAKE_RELEASE_POSTFIX}${CMAKE_DEBUG_POSTFIX}
+COMMAND ${GENERATORRUNNER_BINARY}
+ --generator-set=${generators_BINARY_DIR}/shiboken_generator${CMAKE_RELEASE_POSTFIX}${CMAKE_DEBUG_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}
--enable-parent-ctor-heuristic
--use-isnull-as-nb_nonzero
${CMAKE_CURRENT_SOURCE_DIR}/global.h