aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo@setantas.net>2011-02-06 00:41:50 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:15:15 -0300
commit0a5cacdb9c25d79df02d7b201ab1f2277caceca3 (patch)
tree42b56d93f8a30bb4109f259b511ff7e6eaeadaff /data
parente8a7efe5905ab8a1b333e5634081b4afcff7c334 (diff)
The option "avoid protected hack" is now set via command line.sb-1.0.0-rc1
Instead of the old ugly way of compiling the behaviour forever using "#define". Reviewed by Hugo Parente <hugo.lima@openbossa.org> Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'data')
-rw-r--r--data/ShibokenConfig-spec.cmake.in7
-rw-r--r--data/shiboken.pc.in1
2 files changed, 0 insertions, 8 deletions
diff --git a/data/ShibokenConfig-spec.cmake.in b/data/ShibokenConfig-spec.cmake.in
index 6e0372821..74c5f4e5f 100644
--- a/data/ShibokenConfig-spec.cmake.in
+++ b/data/ShibokenConfig-spec.cmake.in
@@ -21,11 +21,4 @@ SET(SHIBOKEN_PYTHON_BASENAME "@PYTHON_BASENAME@")
message(STATUS "libshiboken built for @SHIBOKEN_BUILD_TYPE@")
@SBK_ADD_PY_DEBUG_DEFINITION@
-# We don't use just "if (@AVOID_PROTECTED_HACK@)" to avoid require all users to turn on the cmake policy CMP0012
-# for more info type: cmake --help-policy CMP0012
-set(SHIBOKEN_AVOID_PROTECTED_HACK @AVOID_PROTECTED_HACK@)
-if (SHIBOKEN_AVOID_PROTECTED_HACK)
- add_definitions(-DAVOID_PROTECTED_HACK)
- message(STATUS "Avoiding protected hack!")
-endif()
set(SHIBOKEN_BINARY "@CMAKE_INSTALL_PREFIX@/bin/@SHIBOKEN_GENERATOR@")
diff --git a/data/shiboken.pc.in b/data/shiboken.pc.in
index 5a88622d9..037288120 100644
--- a/data/shiboken.pc.in
+++ b/data/shiboken.pc.in
@@ -5,7 +5,6 @@ includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken
generator_location=@CMAKE_INSTALL_PREFIX@/bin/@SHIBOKEN_GENERATOR@
python_interpreter=@PYTHON_EXECUTABLE@
python_include_dir=@SBK_PYTHON_INCLUDE_DIR@
-avoid_protected_hack=@AVOID_PROTECTED_HACK@
Name: shiboken
Description: Support library for Python bindings created with Shiboken generator.