gr: the CMakeLists.txt took a chill pill

9 files changed, 60 insertions, 60 deletions

diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt
index 16ee6bbf0..d14366400 100644
--- a/gr-vocoder/CMakeLists.txt
+++ b/gr-vocoder/CMakeLists.txt
@@ -20,12 +20,12 @@
 ########################################################################
 # Setup dependencies
 ########################################################################
-INCLUDE(GrBoost)
+include(GrBoost)
 
 ########################################################################
 # Register component
 ########################################################################
-INCLUDE(GrComponent)
+include(GrComponent)
 GR_REGISTER_COMPONENT("gr-vocoder" ENABLE_GR_VOCODER
     Boost_FOUND
     ENABLE_GR_CORE_
@@ -38,12 +38,12 @@ GR_SET_GLOBAL(GR_VOCODER_INCLUDE_DIRS
 ########################################################################
 # Begin conditional configuration
 ########################################################################
-IF(ENABLE_GR_VOCODER)
+if(ENABLE_GR_VOCODER)
 
 ########################################################################
 # Setup CPack components
 ########################################################################
-INCLUDE(GrPackage)
+include(GrPackage)
 CPACK_SET(CPACK_COMPONENT_GROUP_VOCODER_DESCRIPTION "GNU Radio Vocoder Blocks")
 
 CPACK_COMPONENT("vocoder_runtime"
@@ -84,26 +84,26 @@ CPACK_COMPONENT("vocoder_swig"
 ########################################################################
 # Add subdirectories
 ########################################################################
-ADD_SUBDIRECTORY(lib)
-ADD_SUBDIRECTORY(include)
-IF(ENABLE_PYTHON)
-    ADD_SUBDIRECTORY(swig)
-    ADD_SUBDIRECTORY(python)
-    ADD_SUBDIRECTORY(examples)
-ENDIF(ENABLE_PYTHON)
+add_subdirectory(lib)
+add_subdirectory(include)
+if(ENABLE_PYTHON)
+    add_subdirectory(swig)
+    add_subdirectory(python)
+    add_subdirectory(examples)
+endif(ENABLE_PYTHON)
 
 ########################################################################
 # Create Pkg Config File
 ########################################################################
-CONFIGURE_FILE(
+configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-vocoder.pc.in
     ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-vocoder.pc
 @ONLY)
 
-INSTALL(
+install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-vocoder.pc
     DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
     COMPONENT "vocoder_devel"
 )
 
-ENDIF(ENABLE_GR_VOCODER)
+endif(ENABLE_GR_VOCODER)
diff --git a/gr-vocoder/examples/CMakeLists.txt b/gr-vocoder/examples/CMakeLists.txt
index 9f8172a75..76a757826 100644
--- a/gr-vocoder/examples/CMakeLists.txt
+++ b/gr-vocoder/examples/CMakeLists.txt
@@ -20,7 +20,7 @@
 ########################################################################
 # Install Examples
 ########################################################################
-INCLUDE(GrPython)
+include(GrPython)
 
 GR_PYTHON_INSTALL(
     PROGRAMS
diff --git a/gr-vocoder/include/CMakeLists.txt b/gr-vocoder/include/CMakeLists.txt
index 390a0afb5..23099f59e 100644
--- a/gr-vocoder/include/CMakeLists.txt
+++ b/gr-vocoder/include/CMakeLists.txt
@@ -20,7 +20,7 @@
 ########################################################################
 # Install header files
 ########################################################################
-INSTALL(FILES
+install(FILES
     vocoder_api.h
     vocoder_alaw_decode_bs.h
     vocoder_alaw_encode_sb.h
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})
diff --git a/gr-vocoder/python/CMakeLists.txt b/gr-vocoder/python/CMakeLists.txt
index c3702ad70..c2d9a6c24 100644
--- a/gr-vocoder/python/CMakeLists.txt
+++ b/gr-vocoder/python/CMakeLists.txt
@@ -20,7 +20,7 @@
 ########################################################################
 # Setup python install
 ########################################################################
-INCLUDE(GrPython)
+include(GrPython)
 
 GR_PYTHON_INSTALL(
     FILES
@@ -33,18 +33,18 @@ GR_PYTHON_INSTALL(
 ########################################################################
 # Handle the unit tests
 ########################################################################
-IF(ENABLE_TESTING)
-INCLUDE(GrTest)
-FILE(GLOB py_qa_test_files "qa_*.py")
-FOREACH(py_qa_test_file ${py_qa_test_files})
-    GET_FILENAME_COMPONENT(py_qa_test_name ${py_qa_test_file} NAME_WE)
-    SET(GR_TEST_PYTHON_DIRS
+if(ENABLE_TESTING)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    set(GR_TEST_PYTHON_DIRS
         ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
         ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
         ${CMAKE_BINARY_DIR}/gr-vocoder/python
         ${CMAKE_BINARY_DIR}/gr-vocoder/swig
     )
-    SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-vocoder)
+    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-vocoder)
     GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
-ENDFOREACH(py_qa_test_file)
-ENDIF(ENABLE_TESTING)
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING)
diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt
index 61d123a74..3a8e16ebf 100644
--- a/gr-vocoder/swig/CMakeLists.txt
+++ b/gr-vocoder/swig/CMakeLists.txt
@@ -20,15 +20,15 @@
 ########################################################################
 # Setup swig generation
 ########################################################################
-INCLUDE(GrPython)
-INCLUDE(GrSwig)
+include(GrPython)
+include(GrSwig)
 
-SET(GR_SWIG_INCLUDE_DIRS
+set(GR_SWIG_INCLUDE_DIRS
     ${GR_VOCODER_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
 )
 
-SET(GR_SWIG_LIBRARIES gnuradio-vocoder)
+set(GR_SWIG_LIBRARIES gnuradio-vocoder)
 
 GR_SWIG_MAKE(vocoder_swig vocoder_swig.i)
 
@@ -38,7 +38,7 @@ GR_SWIG_INSTALL(
     COMPONENT "vocoder_python"
 )
 
-INSTALL(
+install(
     FILES
     vocoder_alaw_decode_bs.i
     vocoder_alaw_encode_sb.i