summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2011-02-07 13:08:04 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2011-02-17 14:43:51 -0300
commit2efb33d2fc1512723a08736e15ab27755184c08c (patch)
tree40f8196b3c2eb1d29e7b6576d1a8b39ad37b44f5
parent5ef2f26ec2e7a91ad2110821e2d5862517d08ca6 (diff)
downloadpyside-2efb33d2fc1512723a08736e15ab27755184c08c.tar.gz
pyside-2efb33d2fc1512723a08736e15ab27755184c08c.tar.xz
pyside-2efb33d2fc1512723a08736e15ab27755184c08c.zip
Updated PySide CMake files to use the new generator argument "avoid-protected-hack".
Reviewed by Hugo Parente <hugo.lima@openbossa.org> Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
-rw-r--r--CMakeLists.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14759da..94129e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,6 +157,13 @@ if (NOT SITE_PACKAGE)
endif()
set(GENERATOR_EXTRA_FLAGS --generator-set=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic --use-isnull-as-nb_nonzero)
+if(WIN32 OR DEFINED AVOID_PROTECTED_HACK)
+ message(STATUS "PySide will be generated avoiding the protected hack!")
+ set(GENERATOR_EXTRA_FLAGS ${GENERATOR_EXTRA_FLAGS} --avoid-protected-hack)
+ add_definitions(-DAVOID_PROTECTED_HACK)
+else()
+ message(STATUS "PySide will be generated using the protected hack!")
+endif()
add_subdirectory(libpyside)
if(QT_QTUITOOLS_FOUND AND QT_QTDESIGNER_FOUND)