4 files changed, 29 insertions, 29 deletions
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt
index 74138b050..abcae3b56 100644
--- a/gr-vocoder/lib/CMakeLists.txt
+++ b/gr-vocoder/lib/CMakeLists.txt
@@ -20,18 +20,18 @@
 ########################################################################
 # Setup the include and linker paths
 ########################################################################
-INCLUDE_DIRECTORIES(
+include_directories(
     ${GNURADIO_CORE_INCLUDE_DIRS}
     ${GR_VOCODER_INCLUDE_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_vocoder_sources
+list(APPEND gr_vocoder_sources
     vocoder_alaw_decode_bs.cc
     vocoder_alaw_encode_sb.cc
     vocoder_codec2_decode_ps.cc
@@ -57,17 +57,17 @@ GR_INCLUDE_SUBDIRECTORY(codec2)
 GR_INCLUDE_SUBDIRECTORY(g7xx)
 GR_INCLUDE_SUBDIRECTORY(gsm)
 
-LIST(APPEND vocoder_libs
+list(APPEND vocoder_libs
     gnuradio-core
     ${Boost_LIBRARIES}
 )
 
-ADD_LIBRARY(gnuradio-vocoder SHARED ${gr_vocoder_sources})
-TARGET_LINK_LIBRARIES(gnuradio-vocoder ${vocoder_libs})
-SET_TARGET_PROPERTIES(gnuradio-vocoder PROPERTIES DEFINE_SYMBOL "gnuradio_vocoder_EXPORTS")
-SET_TARGET_PROPERTIES(gnuradio-vocoder PROPERTIES SOVERSION ${LIBVER})
+add_library(gnuradio-vocoder SHARED ${gr_vocoder_sources})
+target_link_libraries(gnuradio-vocoder ${vocoder_libs})
+set_target_properties(gnuradio-vocoder PROPERTIES DEFINE_SYMBOL "gnuradio_vocoder_EXPORTS")
+set_target_properties(gnuradio-vocoder PROPERTIES SOVERSION ${LIBVER})
 
-INSTALL(TARGETS gnuradio-vocoder
+install(TARGETS gnuradio-vocoder
     LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "vocoder_runtime" # .so/.dylib file
     ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT "vocoder_devel" # .lib file
     RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "vocoder_runtime" # .dll file
diff --git a/gr-vocoder/lib/codec2/CMakeLists.txt b/gr-vocoder/lib/codec2/CMakeLists.txt
index 3a666fb59..c9839bd96 100644
--- a/gr-vocoder/lib/codec2/CMakeLists.txt
+++ b/gr-vocoder/lib/codec2/CMakeLists.txt
@@ -21,17 +21,17 @@
 # Create executable to generate other sources
 # http://www.vtk.org/Wiki/CMake_Cross_Compiling#Using_executables_in_the_build_created_during_the_build
 ########################################################################
-IF(NOT CMAKE_CROSSCOMPILING)
-    INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-    ADD_EXECUTABLE(generate_codebook ${CMAKE_CURRENT_SOURCE_DIR}/generate_codebook.c)
-    TARGET_LINK_LIBRARIES(generate_codebook -lm)
-    EXPORT(TARGETS generate_codebook APPEND FILE ${EXPORT_FILE})
-ENDIF()
+if(NOT CMAKE_CROSSCOMPILING)
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+    add_executable(generate_codebook ${CMAKE_CURRENT_SOURCE_DIR}/generate_codebook.c)
+    target_link_libraries(generate_codebook -lm)
+    export(TARGETS generate_codebook APPEND FILE ${EXPORT_FILE})
+endif()
 
 ########################################################################
 # Create codebook
 ########################################################################
-SET(CODEBOOKS
+set(CODEBOOKS
     ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp1.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp2.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp3.txt
@@ -44,7 +44,7 @@ SET(CODEBOOKS
     ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp10.txt
 )
 
-ADD_CUSTOM_COMMAND(
+add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebook.c
     DEPENDS generate_codebook ${CODEBOOKS}
     COMMAND generate_codebook lsp_cb ${CODEBOOKS} > ${CMAKE_CURRENT_BINARY_DIR}/codebook.c
@@ -53,7 +53,7 @@ ADD_CUSTOM_COMMAND(
 ########################################################################
 # Create codebookd
 ########################################################################
-SET(CODEBOOKSD
+set(CODEBOOKSD
     ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp1.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp2.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp3.txt
@@ -66,7 +66,7 @@ SET(CODEBOOKSD
     ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp10.txt
 )
 
-ADD_CUSTOM_COMMAND(
+add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebookd.c
     DEPENDS generate_codebook ${CODEBOOKSD}
     COMMAND generate_codebook lsp_cbd ${CODEBOOKSD} > ${CMAKE_CURRENT_BINARY_DIR}/codebookd.c
@@ -75,7 +75,7 @@ ADD_CUSTOM_COMMAND(
 ########################################################################
 # Create codebookdvq
 ########################################################################
-SET(CODEBOOKSDVQ
+set(CODEBOOKSDVQ
     ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp1.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp2.txt
     ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp3.txt
@@ -83,7 +83,7 @@ SET(CODEBOOKSDVQ
     ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp5.txt 
 )
 
-ADD_CUSTOM_COMMAND(
+add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebookdvq.c
     DEPENDS generate_codebook ${CODEBOOKSDVQ}
     COMMAND generate_codebook lsp_cbdvq ${CODEBOOKSDVQ} > ${CMAKE_CURRENT_BINARY_DIR}/codebookdvq.c
@@ -92,7 +92,7 @@ ADD_CUSTOM_COMMAND(
 ########################################################################
 # Append all sources in this dir
 ########################################################################
-LIST(APPEND gr_vocoder_sources
+list(APPEND gr_vocoder_sources
     ${CMAKE_CURRENT_BINARY_DIR}/codebook.c
     ${CMAKE_CURRENT_BINARY_DIR}/codebookd.c
     ${CMAKE_CURRENT_BINARY_DIR}/codebookdvq.c
diff --git a/gr-vocoder/lib/g7xx/CMakeLists.txt b/gr-vocoder/lib/g7xx/CMakeLists.txt
index 4c67109e1..bde7538d2 100644
--- a/gr-vocoder/lib/g7xx/CMakeLists.txt
+++ b/gr-vocoder/lib/g7xx/CMakeLists.txt
@@ -20,8 +20,8 @@
 ########################################################################
 # Append all sources in this dir
 ########################################################################
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-LIST(APPEND gr_vocoder_sources
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+list(APPEND gr_vocoder_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/g711.c
     ${CMAKE_CURRENT_SOURCE_DIR}/g72x.c
     ${CMAKE_CURRENT_SOURCE_DIR}/g721.c
diff --git a/gr-vocoder/lib/gsm/CMakeLists.txt b/gr-vocoder/lib/gsm/CMakeLists.txt
index 128f87231..8a4813a4f 100644
--- a/gr-vocoder/lib/gsm/CMakeLists.txt
+++ b/gr-vocoder/lib/gsm/CMakeLists.txt
@@ -20,9 +20,9 @@
 ########################################################################
 # Append all sources in this dir
 ########################################################################
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-SET(gsm_sources
+set(gsm_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/add.c
     ${CMAKE_CURRENT_SOURCE_DIR}/code.c
     ${CMAKE_CURRENT_SOURCE_DIR}/debug.c
@@ -43,7 +43,7 @@ SET(gsm_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/table.c
 )
 
-SET_SOURCE_FILES_PROPERTIES(${gsm_sources}
+set_source_files_properties(${gsm_sources}
     PROPERTIES COMPILE_DEFINITION "NeedFunctionPrototypes=1"
 )
-LIST(APPEND gr_vocoder_sources ${gsm_sources})
+list(APPEND gr_vocoder_sources ${gsm_sources})