summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2011-01-24 08:40:09 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:13:52 -0300
commitfe044247d153725db1f3060f30f53f7e6c1e4381 (patch)
tree02f10ab1e0d46be30ee007c7d9dd371eafa2a1f5
parent2d3668274953cc4d38ea58259249a263fe85b41b (diff)
Added SHIBOKEN_BINARY variable to CMake config file.
It points to the Shiboken generator executable so the users can use it instead of calling GeneratorRunner plus a parameter pointing to Shiboken generator module. Also fixed generator_location variable on shiboken.pc file.
-rw-r--r--data/CMakeLists.txt4
-rw-r--r--data/ShibokenConfig-spec.cmake.in4
-rw-r--r--data/shiboken.pc.in2
3 files changed, 8 insertions, 2 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 66838599..da9dbd4c 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -4,6 +4,10 @@ else()
set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_RELEASE_POSTFIX})
endif()
+add_custom_target(data)
+add_dependencies(data shiboken)
+get_target_property(SHIBOKEN_GENERATOR shiboken OUTPUT_NAME)
+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig.cmake" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig-spec.cmake.in"
diff --git a/data/ShibokenConfig-spec.cmake.in b/data/ShibokenConfig-spec.cmake.in
index 36f0e733..6e037282 100644
--- a/data/ShibokenConfig-spec.cmake.in
+++ b/data/ShibokenConfig-spec.cmake.in
@@ -1,5 +1,6 @@
# SHIBOKEN_INCLUDE_DIR - Directories to include to use SHIBOKEN
-# SHIBOKEN_LIBRARIES - Files to link against to use SHIBOKEN
+# SHIBOKEN_LIBRARY - Files to link against to use SHIBOKEN
+# SHIBOKEN_BINARY - Executable name
# SHIBOKEN_BUILD_TYPE - Tells if Shiboken was compiled in Release or Debug mode.
# SHIBOKEN_PYTHON_INTERPRETER - Python interpreter (regular or debug) to be used with the bindings.
# SHIBOKEN_PYTHON_LIBRARIES - Python libraries (regular or debug) Shiboken is linked against.
@@ -27,3 +28,4 @@ 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 6cef4841..5a88622d 100644
--- a/data/shiboken.pc.in
+++ b/data/shiboken.pc.in
@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
libdir=@LIB_INSTALL_DIR@
includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken
-generator_location=@CMAKE_INSTALL_PREFIX@/bin/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@