summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorTom Rondeau2011-10-23 17:12:32 -0400
committerTom Rondeau2011-10-23 17:12:32 -0400
commit7112e308a6b0b84387c73460c4c8d1e8ff9f3b5a (patch)
treee96b5804d26e221ab0de2c5bbeaffd7ab88159fd /cmake
parentfea70a9c312ebf9cfcf8b5ddb60db3b6a3004248 (diff)
downloadgnuradio-7112e308a6b0b84387c73460c4c8d1e8ff9f3b5a.tar.gz
gnuradio-7112e308a6b0b84387c73460c4c8d1e8ff9f3b5a.tar.bz2
gnuradio-7112e308a6b0b84387c73460c4c8d1e8ff9f3b5a.zip
core: Added type conversion int->float (issue #192). Added with a gri file and also added a gri file for float->int to perform function inside gr_float_to_int. Also added QA code for the new block.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Modules/GrVersion.cmake20
1 files changed, 10 insertions, 10 deletions
diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake
index 16338f143..ed8fabddd 100644
--- a/cmake/Modules/GrVersion.cmake
+++ b/cmake/Modules/GrVersion.cmake
@@ -44,16 +44,16 @@ set(MAINT_VERSION ${VERSION_INFO_MAINT_VERSION})
########################################################################
find_package(Git)
-if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
- message(STATUS "Extracting version information from git describe...")
- execute_process(
- COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=8
- OUTPUT_VARIABLE GIT_DESCRIBE OUTPUT_STRIP_TRAILING_WHITESPACE
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- )
-else()
- set(GIT_DESCRIBE "v${MAJOR_VERSION}.${API_COMPAT}.x-xxx-xunknown")
-endif()
+#if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
+# message(STATUS "Extracting version information from git describe...")
+# execute_process(
+# COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=8
+# OUTPUT_VARIABLE GIT_DESCRIBE OUTPUT_STRIP_TRAILING_WHITESPACE
+# WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+# )
+#else()
+# set(GIT_DESCRIBE "v${MAJOR_VERSION}.${API_COMPAT}.x-xxx-xunknown")
+#endif()
########################################################################
# Parse the git describe string (currently unused)