7 files changed, 57 insertions, 57 deletions
diff --git a/gr-uhd/CMakeLists.txt b/gr-uhd/CMakeLists.txt
index 1023208842..d660cfd36b 100644
--- a/gr-uhd/CMakeLists.txt
+++ b/gr-uhd/CMakeLists.txt
@@ -20,14 +20,14 @@
 ########################################################################
 # Setup dependencies
 ########################################################################
-INCLUDE(GrBoost)
+include(GrBoost)
 
-FIND_PACKAGE(UHD)
+find_package(UHD)
 
 ########################################################################
 # Register component
 ########################################################################
-INCLUDE(GrComponent)
+include(GrComponent)
 GR_REGISTER_COMPONENT("gr-uhd" ENABLE_GR_UHD
     Boost_FOUND
     UHD_FOUND
@@ -42,12 +42,12 @@ GR_SET_GLOBAL(GR_UHD_INCLUDE_DIRS
 ########################################################################
 # Begin conditional configuration
 ########################################################################
-IF(ENABLE_GR_UHD)
+if(ENABLE_GR_UHD)
 
 ########################################################################
 # Setup CPack components
 ########################################################################
-INCLUDE(GrPackage)
+include(GrPackage)
 CPACK_SET(CPACK_COMPONENT_GROUP_UHD_DESCRIPTION "GNU Radio UHD Blocks")
 
 CPACK_COMPONENT("uhd_runtime"
@@ -81,27 +81,27 @@ CPACK_COMPONENT("uhd_swig"
 ########################################################################
 # Add subdirectories
 ########################################################################
-ADD_SUBDIRECTORY(include)
-ADD_SUBDIRECTORY(lib)
-ADD_SUBDIRECTORY(examples)
-IF(ENABLE_PYTHON)
-    ADD_SUBDIRECTORY(swig)
-    ADD_SUBDIRECTORY(grc)
-    ADD_SUBDIRECTORY(apps)
-ENDIF(ENABLE_PYTHON)
+add_subdirectory(include)
+add_subdirectory(lib)
+add_subdirectory(examples)
+if(ENABLE_PYTHON)
+    add_subdirectory(swig)
+    add_subdirectory(grc)
+    add_subdirectory(apps)
+endif(ENABLE_PYTHON)
 
 ########################################################################
 # Create Pkg Config File
 ########################################################################
-CONFIGURE_FILE(
+configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-uhd.pc.in
     ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-uhd.pc
 @ONLY)
 
-INSTALL(
+install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-uhd.pc
     DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
     COMPONENT "uhd_devel"
 )
 
-ENDIF(ENABLE_GR_UHD)
+endif(ENABLE_GR_UHD)
diff --git a/gr-uhd/apps/CMakeLists.txt b/gr-uhd/apps/CMakeLists.txt
index e17be1d9b4..36bee13e0a 100644
--- a/gr-uhd/apps/CMakeLists.txt
+++ b/gr-uhd/apps/CMakeLists.txt
@@ -17,7 +17,7 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-INCLUDE(GrPython)
+include(GrPython)
 
 ########################################################################
 # Install some uhd apps
@@ -36,7 +36,7 @@ GR_PYTHON_INSTALL(
 ########################################################################
 # Install hf radio apps
 ########################################################################
-INSTALL(
+install(
     FILES
     hf_radio/hfir.sci
     hf_radio/radio.xml
@@ -68,7 +68,7 @@ GR_PYTHON_INSTALL(
 ########################################################################
 # Install hf explorer
 ########################################################################
-INSTALL(
+install(
     FILES
     hf_explorer/README
     hf_explorer/hfx_help
diff --git a/gr-uhd/examples/CMakeLists.txt b/gr-uhd/examples/CMakeLists.txt
index f5890a484d..9e92b89d7a 100644
--- a/gr-uhd/examples/CMakeLists.txt
+++ b/gr-uhd/examples/CMakeLists.txt
@@ -20,28 +20,28 @@
 ########################################################################
 # Setup the include and linker paths
 ########################################################################
-INCLUDE_DIRECTORIES(
+include_directories(
     ${GNURADIO_CORE_INCLUDE_DIRS}
     ${GR_UHD_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-INCLUDE_DIRECTORIES(${UHD_INCLUDE_DIRS})
-LINK_DIRECTORIES(${UHD_LIBRARY_DIRS})
+include_directories(${UHD_INCLUDE_DIRS})
+link_directories(${UHD_LIBRARY_DIRS})
 
-INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
 
 ########################################################################
 # Build executable
 ########################################################################
-ADD_EXECUTABLE(tags_demo tags_demo.cc)
-TARGET_LINK_LIBRARIES(tags_demo gnuradio-uhd)
+add_executable(tags_demo tags_demo.cc)
+target_link_libraries(tags_demo gnuradio-uhd)
 
 ########################################################################
 # Python examples
 ########################################################################
-IF(ENABLE_PYTHON)
+if(ENABLE_PYTHON)
 GR_PYTHON_INSTALL(
     PROGRAMS
     fm_tx4.py
@@ -72,4 +72,4 @@ GR_PYTHON_INSTALL(
     DESTINATION ${GR_PKG_DATA_DIR}/examples/multi-antenna
     COMPONENT "uhd_python"
 )
-ENDIF(ENABLE_PYTHON)
+endif(ENABLE_PYTHON)
diff --git a/gr-uhd/grc/CMakeLists.txt b/gr-uhd/grc/CMakeLists.txt
index d89b8d77e6..3297db8d78 100644
--- a/gr-uhd/grc/CMakeLists.txt
+++ b/gr-uhd/grc/CMakeLists.txt
@@ -20,24 +20,24 @@
 ########################################################################
 # Rules for generating the source and sink xml wrappers
 ########################################################################
-INCLUDE(GrPython)
+include(GrPython)
 
-MACRO(GEN_BLOCK_XML _generator _xml_block)
-    SET(generator ${CMAKE_CURRENT_SOURCE_DIR}/${_generator})
-    SET(xml_block ${CMAKE_CURRENT_BINARY_DIR}/${_xml_block})
-    LIST(APPEND xml_blocks ${xml_block})
-    ADD_CUSTOM_COMMAND(
+macro(GEN_BLOCK_XML _generator _xml_block)
+    set(generator ${CMAKE_CURRENT_SOURCE_DIR}/${_generator})
+    set(xml_block ${CMAKE_CURRENT_BINARY_DIR}/${_xml_block})
+    list(APPEND xml_blocks ${xml_block})
+    add_custom_command(
         DEPENDS ${generator} OUTPUT ${xml_block}
         COMMAND ${PYTHON_EXECUTABLE} ${generator} ${xml_block}
     )
-ENDMACRO(GEN_BLOCK_XML)
+endmacro(GEN_BLOCK_XML)
 
 GEN_BLOCK_XML(gen_uhd_usrp_blocks.py    uhd_usrp_source.xml)
 GEN_BLOCK_XML(gen_uhd_usrp_blocks.py    uhd_usrp_sink.xml)
 
-ADD_CUSTOM_TARGET(uhd_grc_xml_blocks ALL DEPENDS ${xml_blocks})
+add_custom_target(uhd_grc_xml_blocks ALL DEPENDS ${xml_blocks})
 
-INSTALL(FILES
+install(FILES
     ${xml_blocks}
     uhd_amsg_source.xml
     uhd_block_tree.xml
diff --git a/gr-uhd/include/CMakeLists.txt b/gr-uhd/include/CMakeLists.txt
index 20d152859f..fdd384d587 100644
--- a/gr-uhd/include/CMakeLists.txt
+++ b/gr-uhd/include/CMakeLists.txt
@@ -20,7 +20,7 @@
 ########################################################################
 # Install header files
 ########################################################################
-INSTALL(FILES
+install(FILES
     gr_uhd_api.h
     gr_uhd_usrp_source.h
     gr_uhd_usrp_sink.h
diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt
index 8afb48942a..fbdca05665 100644
--- a/gr-uhd/lib/CMakeLists.txt
+++ b/gr-uhd/lib/CMakeLists.txt
@@ -20,38 +20,38 @@
 ########################################################################
 # Setup the include and linker paths
 ########################################################################
-INCLUDE_DIRECTORIES(
+include_directories(
     ${GNURADIO_CORE_INCLUDE_DIRS}
     ${GR_UHD_INCLUDE_DIRS}
 )
 
-INCLUDE_DIRECTORIES(${UHD_INCLUDE_DIRS})
-LINK_DIRECTORIES(${UHD_LIBRARY_DIRS})
+include_directories(${UHD_INCLUDE_DIRS})
+link_directories(${UHD_LIBRARY_DIRS})
 
-INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
 
 ########################################################################
 # Setup library
 ########################################################################
-LIST(APPEND gr_uhd_sources
+list(APPEND gr_uhd_sources
     gr_uhd_usrp_source.cc
     gr_uhd_usrp_sink.cc
     gr_uhd_amsg_source.cc
 )
 
-LIST(APPEND uhd_libs
+list(APPEND uhd_libs
     gnuradio-core
     ${Boost_LIBRARIES}
     ${UHD_LIBRARIES}
 )
 
-ADD_LIBRARY(gnuradio-uhd SHARED ${gr_uhd_sources})
-TARGET_LINK_LIBRARIES(gnuradio-uhd ${uhd_libs})
-SET_TARGET_PROPERTIES(gnuradio-uhd PROPERTIES DEFINE_SYMBOL "gnuradio_uhd_EXPORTS")
-SET_TARGET_PROPERTIES(gnuradio-uhd PROPERTIES SOVERSION ${LIBVER})
+add_library(gnuradio-uhd SHARED ${gr_uhd_sources})
+target_link_libraries(gnuradio-uhd ${uhd_libs})
+set_target_properties(gnuradio-uhd PROPERTIES DEFINE_SYMBOL "gnuradio_uhd_EXPORTS")
+set_target_properties(gnuradio-uhd PROPERTIES SOVERSION ${LIBVER})
 
-INSTALL(TARGETS gnuradio-uhd
+install(TARGETS gnuradio-uhd
     LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "uhd_runtime" # .so/.dylib file
     ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT "uhd_devel" # .lib file
     RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "uhd_runtime" # .dll file
diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt
index fec3cba6f7..4c778b05c5 100644
--- a/gr-uhd/swig/CMakeLists.txt
+++ b/gr-uhd/swig/CMakeLists.txt
@@ -20,17 +20,17 @@
 ########################################################################
 # Setup swig generation
 ########################################################################
-INCLUDE(GrPython)
-INCLUDE(GrSwig)
+include(GrPython)
+include(GrSwig)
 
-SET(GR_SWIG_FLAGS -DGR_HAVE_UHD) #needed to parse uhd_swig.i
+set(GR_SWIG_FLAGS -DGR_HAVE_UHD) #needed to parse uhd_swig.i
 
-SET(GR_SWIG_INCLUDE_DIRS
+set(GR_SWIG_INCLUDE_DIRS
     ${GR_UHD_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
 )
-LINK_DIRECTORIES(${UHD_LIBRARY_DIRS})
-SET(GR_SWIG_LIBRARIES gnuradio-uhd ${UHD_LIBRARIES})
+link_directories(${UHD_LIBRARY_DIRS})
+set(GR_SWIG_LIBRARIES gnuradio-uhd ${UHD_LIBRARIES})
 
 GR_SWIG_MAKE(uhd_swig uhd_swig.i)
 
@@ -40,7 +40,7 @@ GR_SWIG_INSTALL(
     COMPONENT "uhd_python"
 )
 
-INSTALL(
+install(
     FILES uhd_swig.i
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
     COMPONENT "uhd_swig"