Resolving merge conflict

CMakeLists.txt

@@ -126,6 +126,36 @@ set(GR_LIBEXEC_DIR      libexec)
 set(GR_PKG_LIBEXEC_DIR  ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME})
 set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)
 
+########################################################################
+# On Apple only, set install name and use rpath correctly, if not already set
+########################################################################
+if(APPLE)
+   if(NOT CMAKE_INSTALL_NAME_DIR)
+       set(CMAKE_INSTALL_NAME_DIR
+           ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE
+           PATH "Library Install Name Destination Directory" FORCE)
+   endif(NOT CMAKE_INSTALL_NAME_DIR)
+   if(NOT CMAKE_INSTALL_RPATH)
+       set(CMAKE_INSTALL_RPATH
+           ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE
+           PATH "Library Install RPath" FORCE)
+   endif(NOT CMAKE_INSTALL_RPATH)
+   if(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
+       set(CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE
+           BOOL "Do Build Using Library Install RPath" FORCE)
+   endif(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
+endif(APPLE)
+
+########################################################################
+# Find gnuradio build dependencies
+########################################################################
+set(GR_REQUIRED_COMPONENTS RUNTIME)
+find_package(Gnuradio "3.7")
+
+
+if(NOT GNURADIO_RUNTIME_FOUND)
+    message(FATAL_ERROR "GnuRadio Runtime required to compile display")
+endif()
 
 find_package(Qt4 REQUIRED )
 include(${QT_USE_FILE})