diff options
| author | Tom Rondeau | 2011-11-12 18:30:13 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-11-12 18:30:13 -0500 |
| commit | 0e7c799e4ef7a392a8ffe47170666908bfcb183f (patch) | |
| tree | deb32d3810b4cb636ecfa24ff613a1aad1fd409c /cmake/Modules/GrSwig.cmake | |
| parent | c9c20b9051b997ab53a27869094648f15e0dccae (diff) | |
| parent | 9a25332b706b1ffadf8cdf9b405e89c37a1e2278 (diff) | |
| download | gnuradio-0e7c799e4ef7a392a8ffe47170666908bfcb183f.tar.gz gnuradio-0e7c799e4ef7a392a8ffe47170666908bfcb183f.tar.bz2 gnuradio-0e7c799e4ef7a392a8ffe47170666908bfcb183f.zip | |
Merge branch 'master' of gnuradio.org:gnuradio
Diffstat (limited to 'cmake/Modules/GrSwig.cmake')
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index 4be583aa1..51d9203dd 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -38,10 +38,18 @@ include(GrPython) macro(GR_SWIG_MAKE name) set(ifiles ${ARGN}) + #append additional include directories + find_package(PythonLibs) + list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_PATH}) #deprecated name (now dirs) + list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS}) + list(APPEND GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) + list(APPEND GR_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}) + #determine include dependencies for swig file execute_process( - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/get_swig_deps.py - "${ifiles}" "${GR_SWIG_INCLUDE_DIRS}" + COMMAND ${PYTHON_EXECUTABLE} + ${CMAKE_BINARY_DIR}/get_swig_deps.py + "${ifiles}" "${GR_SWIG_INCLUDE_DIRS}" OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE SWIG_MODULE_${name}_EXTRA_DEPS WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} @@ -61,9 +69,6 @@ macro(GR_SWIG_MAKE name) include_directories(${GR_SWIG_INCLUDE_DIRS}) list(APPEND SWIG_MODULE_${name}_EXTRA_DEPS ${tag_file}) - find_package(PythonLibs) - include_directories(${PYTHON_INCLUDE_DIRS}) - #setup the swig flags with flags and include directories set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -module ${name} ${GR_SWIG_FLAGS}) foreach(dir ${GR_SWIG_INCLUDE_DIRS}) |