diff options
| author | Josh Blum | 2011-07-24 12:27:21 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-07-24 12:27:21 -0700 |
| commit | aad02c6dc09d044c112f29bebec4cc79b0e13aab (patch) | |
| tree | 4800a3e053bfc654db975b5191e8cbdbb366f001 | |
| parent | a3425a6fbc0e90825ced32008e6f536542cb6501 (diff) | |
| download | gnuradio-aad02c6dc09d044c112f29bebec4cc79b0e13aab.tar.gz gnuradio-aad02c6dc09d044c112f29bebec4cc79b0e13aab.tar.bz2 gnuradio-aad02c6dc09d044c112f29bebec4cc79b0e13aab.zip | |
video-sdl: solution for proper swig directory windows
| -rw-r--r-- | cmake/Modules/GrTest.cmake | 4 | ||||
| -rw-r--r-- | gr-video-sdl/src/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmake/Modules/GrTest.cmake b/cmake/Modules/GrTest.cmake index a3605f198..308579008 100644 --- a/cmake/Modules/GrTest.cmake +++ b/cmake/Modules/GrTest.cmake @@ -50,10 +50,10 @@ FUNCTION(GR_ADD_TEST test_name) #SWIG generates the python library files into a subdirectory. #Therefore, we must append this subdirectory into PYTHONPATH. - #Only do this for the python directories ending with "swig". + #Only do this for the python directories matching the following: FOREACH(pydir ${GR_TEST_PYTHON_DIRS}) GET_FILENAME_COMPONENT(name ${pydir} NAME) - IF(name MATCHES "^(swig|lib)$") + IF(name MATCHES "^(swig|lib|src)$") LIST(APPEND GR_TEST_PYTHON_DIRS ${pydir}/${CMAKE_BUILD_TYPE}) ENDIF() ENDFOREACH(pydir) diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt index 555b04e04..38181075a 100644 --- a/gr-video-sdl/src/CMakeLists.txt +++ b/gr-video-sdl/src/CMakeLists.txt @@ -108,7 +108,6 @@ FOREACH(py_qa_test_file ${py_qa_test_files}) ${CMAKE_BINARY_DIR}/gnuradio-core/src/python ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig ${CMAKE_BINARY_DIR}/gr-video-sdl/src - ${CMAKE_BINARY_DIR}/gr-video-sdl/src/${CMAKE_BUILD_TYPE} #for WIN32 because it only auto-adds the outdir for swig dirs, not src dirs ) SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-video-sdl) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file}) |