summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2010-10-25 18:25:50 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2010-10-26 09:42:12 -0300
commit9d479c812d4e2e6fc427f96af4ce4f415c8eab0a (patch)
tree538251baa8562d730a6fc75221d33a5a002bf519
parent839d7efb8f42e732cfab043ba74384f52502e70b (diff)
downloadshiboken-9d479c812d4e2e6fc427f96af4ce4f415c8eab0a.tar.gz
shiboken-9d479c812d4e2e6fc427f96af4ce4f415c8eab0a.tar.xz
shiboken-9d479c812d4e2e6fc427f96af4ce4f415c8eab0a.zip
libshiboken now sets debug flags for all modules linking against it.
The information was added to cmake and pkg-config files. Reviewed by Lauro Moura <lauro.neto@openbossa.org> Reviewed by Renato Araujo <renato.filho@openbossa.org>
-rw-r--r--CMakeLists.txt3
-rw-r--r--data/ShibokenConfig.cmake.in4
-rw-r--r--data/shiboken.pc.in2
3 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc4c8348..a0a4469d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,6 +78,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
message(WARNING "Compiling shiboken with debug enabled, but the python executable was not compiled with debug support.")
else()
add_definitions("-DPy_DEBUG")
+ set(SBK_ADD_PY_DEBUG_DEFINITION "add_definitions(\"-DPy_DEBUG\")")
+ set(SBK_PKG_CONFIG_PY_DEBUG_DEFINITION " -DPy_DEBUG")
endif()
set(SBK_PYTHON_LIBRARIES ${PYTHON_DEBUG_LIBRARIES})
set(SHIBOKEN_BUILD_TYPE "Debug")
@@ -90,6 +92,7 @@ if(APPLE)
endif()
+
if (BUILD_TESTS)
enable_testing()
endif()
diff --git a/data/ShibokenConfig.cmake.in b/data/ShibokenConfig.cmake.in
index 367ac5c0..2b9a3a09 100644
--- a/data/ShibokenConfig.cmake.in
+++ b/data/ShibokenConfig.cmake.in
@@ -12,6 +12,8 @@ elseif(WIN32)
else()
SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
endif()
-SET(SHIBOKEN_BUILD_TYPE "@SHIBOKEN_BUILD_TYPE@")
SET(SHIBOKEN_PYTHON_INTERPRETER "@PYTHON_EXECUTABLE@")
SET(SHIBOKEN_PYTHON_LIBRARIES "@SBK_PYTHON_LIBRARIES@")
+SET(SHIBOKEN_BUILD_TYPE "@SHIBOKEN_BUILD_TYPE@")
+message("libshiboken built for @SHIBOKEN_BUILD_TYPE@")
+@SBK_ADD_PY_DEBUG_DEFINITION@
diff --git a/data/shiboken.pc.in b/data/shiboken.pc.in
index 75d8578b..4140f16e 100644
--- a/data/shiboken.pc.in
+++ b/data/shiboken.pc.in
@@ -9,5 +9,5 @@ Name: shiboken
Description: Support library for Python bindings created with Shiboken generator.
Version: @shiboken_VERSION@
Libs: @SBK_PYTHON_LIBRARIES@ -L${libdir} -lshiboken@shiboken_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
-Cflags: -I@PYTHON_INCLUDE_PATH@ -I${includedir}/@shiboken_SUFFIX@
+Cflags: -I@PYTHON_INCLUDE_PATH@ -I${includedir}/@shiboken_SUFFIX@@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@