diff options
| author | Diane Bruce <db@FreeBSD.org> | 2015-07-26 23:00:18 +0000 |
|---|---|---|
| committer | Diane Bruce <db@FreeBSD.org> | 2015-07-26 23:00:18 +0000 |
| commit | 618e88079c9db41ae82efa792705ae66d3596fe6 (patch) | |
| tree | 9bdac210d68f34d2b20dbd59f40e047d110b8aad /comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake | |
| parent | Revert r392917 and part of r392902 (to gstreamer1-plugins/Makefile). (diff) | |
- Update to later version of gnuradio
- fix build with portaudio
- clang builtin's are conflicting with gnuradio so use USE_GCC for now
Notes
Notes:
svn path=/head/; revision=392951
Diffstat (limited to 'comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake')
| -rw-r--r-- | comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake b/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake index cd59e35af5bf..d44873906ade 100644 --- a/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake +++ b/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake @@ -1,11 +1,11 @@ ---- cmake/Modules/GrMiscUtils.cmake.orig 2014-07-07 17:29:01.000000000 -0400 -+++ cmake/Modules/GrMiscUtils.cmake 2014-07-29 18:42:23.000000000 -0400 -@@ -142,7 +142,31 @@ +--- cmake/Modules/GrMiscUtils.cmake.orig 2015-05-12 09:39:44 UTC ++++ cmake/Modules/GrMiscUtils.cmake +@@ -148,7 +148,31 @@ function(GR_LIBRARY_FOO target) ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_DEVEL_COMPONENT} # .lib file RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} # .dll file ) + - ++ + if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + #create .la file + GR_LIBTOOL(TARGET ${target} DESTINATION ${GR_LIBRARY_DIR}) @@ -20,7 +20,7 @@ + COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} "${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so.${MAJOR_VERSION}" + COMMAND ${CMAKE_COMMAND} -E touch ${target_name} #so the symlinks point to something valid so cmake 2.6 will install + ) -+ + + #and install the extra symlinks + install( + FILES |