diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-01-20 16:14:07 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:13:49 -0300 |
| commit | 38e10e17700b5381022315729f531f2b863ee3ae (patch) | |
| tree | baf38f85aa573ab5359b49f08f7e9e86395d752c | |
| parent | d931b4cf3c4e9fd3bf3e4909f096625da69a78ee (diff) | |
Use SBK_PYTHON_INCLUDE_DIR instead of PYTHON_INCLUDE_DIRS or PYTHON_INCLUDE_PATH.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Lauro Moura <lauro.neto@openbossa.org>
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | data/shiboken.pc.in | 4 | ||||
| -rw-r--r-- | libshiboken/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/otherbinding/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/samplebinding/CMakeLists.txt | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eb4372ceb..f7087c187 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,6 +102,12 @@ if(APPLE) set(SBK_PYTHON_LIBRARIES "-undefined dynamic_lookup") endif() +if(CMAKE_VERSION VERSION_LESS 2.8) + set(SBK_PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_PATH}) +else() + set(SBK_PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_DIRS}) +endif() + add_subdirectory(libshiboken) add_subdirectory(doc) @@ -117,12 +123,6 @@ else() message(WARNING "Some dependencies were not found, shiboken generator compilation disabled!") endif() -if(CMAKE_VERSION VERSION_LESS 2.8) - set(SBK_PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_PATH}) -else() - set(SBK_PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_DIRS}) -endif() - add_subdirectory(data) # dist target diff --git a/data/shiboken.pc.in b/data/shiboken.pc.in index 2a5e33d86..6cef48417 100644 --- a/data/shiboken.pc.in +++ b/data/shiboken.pc.in @@ -4,11 +4,11 @@ libdir=@LIB_INSTALL_DIR@ includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken generator_location=@CMAKE_INSTALL_PREFIX@/bin/shiboken python_interpreter=@PYTHON_EXECUTABLE@ -python_include_dir=@PYTHON_INCLUDE_DIR@ +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. Version: @shiboken_VERSION@ Libs: @SBK_PYTHON_LIBRARIES@ -L${libdir} -lshiboken${shiboken_SUFFIX}@LIBRARY_OUTPUT_SUFFIX@ -Cflags: -I@PYTHON_INCLUDE_PATH@ -I${includedir}/${shiboken_SUFFIX}@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@ +Cflags: -I@SBK_PYTHON_INCLUDE_DIR@ -I${includedir}/${shiboken_SUFFIX}@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@ diff --git a/libshiboken/CMakeLists.txt b/libshiboken/CMakeLists.txt index d08c1f456..0cf3f3d21 100644 --- a/libshiboken/CMakeLists.txt +++ b/libshiboken/CMakeLists.txt @@ -32,7 +32,7 @@ typeresolver.cpp ) include_directories(${CMAKE_CURRENT_SOURCE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SBK_PYTHON_INCLUDE_DIR} ${SPARSEHASH_INCLUDE_PATH}) add_library(libshiboken SHARED ${libshiboken_SRC}) target_link_libraries(libshiboken ${SBK_PYTHON_LIBRARIES}) diff --git a/tests/otherbinding/CMakeLists.txt b/tests/otherbinding/CMakeLists.txt index 3a16dd67c..ebea91255 100644 --- a/tests/otherbinding/CMakeLists.txt +++ b/tests/otherbinding/CMakeLists.txt @@ -26,7 +26,7 @@ COMMENT "Running generator for test binding..." include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SBK_PYTHON_INCLUDE_DIR} ${libother_SOURCE_DIR} ${libsample_SOURCE_DIR} ${libsample_SOURCE_DIR}/.. diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt index abeade93f..c22351f5b 100644 --- a/tests/samplebinding/CMakeLists.txt +++ b/tests/samplebinding/CMakeLists.txt @@ -100,7 +100,7 @@ COMMENT "Running generator for test binding..." include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} - ${PYTHON_INCLUDE_PATH} + ${SBK_PYTHON_INCLUDE_DIR} ${libsample_SOURCE_DIR} ${libshiboken_SOURCE_DIR}) add_library(sample MODULE ${sample_SRC}) |