[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: Use VERBATIM in custom commands to f
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: Use VERBATIM in custom commands to fix quoting, to make CMake happy with the Python command being issued |
Date: |
Mon, 31 Mar 2014 18:35:02 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit dee85a7f4932c2475d9e84c5f92c2f3220aed3e6
Author: Michael Dickens <address@hidden>
Date: Tue Mar 25 17:09:43 2014 -0400
Use VERBATIM in custom commands to fix quoting, to make CMake happy with
the Python command being issued
---
cmake/Modules/GrPython.cmake | 3 ++-
gnuradio-runtime/lib/pmt/CMakeLists.txt | 3 ++-
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 d0d7886..ed7f05c 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 0cc46e4..193ccbe 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 907aedf..f2adc31 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