diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2014-03-31 11:21:52 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-03-31 11:21:52 -0700 |
| commit | 0844b31da579619d3f7cad6020250eb37e38ba68 (patch) | |
| tree | f98575e4600dda2652a5a4fa1a959f5b639ce0cb | |
| parent | c4eb23168c9c15d9fc7789e373a88991245380a8 (diff) | |
| parent | dee85a7f4932c2475d9e84c5f92c2f3220aed3e6 (diff) | |
Merge remote-tracking branch 'michaelld/fix_Wno_dev_warnings' into maint
| -rw-r--r-- | cmake/Modules/GrPython.cmake | 3 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/pmt/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | volk/cmake/GrPython.cmake | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake index d0d78863cc..ed7f05c4e1 100644 --- a/cmake/Modules/GrPython.cmake +++ b/cmake/Modules/GrPython.cmake @@ -207,8 +207,9 @@ function(GR_PYTHON_INSTALL) add_custom_command( OUTPUT ${pyexefile} DEPENDS ${pyfile} COMMAND ${PYTHON_EXECUTABLE} -c - \"open('${pyexefile}', 'w').write('\#!${pyexe_native}\\n'+open('${pyfile}').read())\" + "open('${pyexefile}','w').write('\#!${pyexe_native}\\n'+open('${pyfile}').read())" COMMENT "Shebangin ${pyfile_name}" + VERBATIM ) #on windows, python files need an extension to execute diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt index 0cc46e426a..193ccbe62f 100644 --- a/gnuradio-runtime/lib/pmt/CMakeLists.txt +++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt @@ -68,8 +68,9 @@ add_custom_command( ${CMAKE_CURRENT_SOURCE_DIR}/unv_template.cc.t ${CMAKE_CURRENT_SOURCE_DIR}/unv_qa_template.cc.t COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -c - \"import os,sys\;srcdir='${CMAKE_CURRENT_SOURCE_DIR}'\;sys.path.append(srcdir)\;os.environ['srcdir']=srcdir\;from generate_unv import main\;main()\" + "import os, sys; srcdir='${CMAKE_CURRENT_SOURCE_DIR}'; sys.path.append(srcdir); os.environ['srcdir']=srcdir; from generate_unv import main; main()" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + VERBATIM ) set(pmt_sources diff --git a/volk/cmake/GrPython.cmake b/volk/cmake/GrPython.cmake index 907aedf899..f2adc31a88 100644 --- a/volk/cmake/GrPython.cmake +++ b/volk/cmake/GrPython.cmake @@ -199,8 +199,9 @@ function(VOLK_PYTHON_INSTALL) add_custom_command( OUTPUT ${pyexefile} DEPENDS ${pyfile} COMMAND ${PYTHON_EXECUTABLE} -c - \"open('${pyexefile}', 'w').write('\#!${pyexe_native}\\n'+open('${pyfile}').read())\" + "open('${pyexefile}','w').write('\#!${pyexe_native}\\n'+open('${pyfile}').read())" COMMENT "Shebangin ${pyfile_name}" + VERBATIM ) #on windows, python files need an extension to execute |