gr: the CMakeLists.txt took a chill pill

11 files changed, 195 insertions, 195 deletions

diff --git a/gnuradio-core/src/lib/CMakeLists.txt b/gnuradio-core/src/lib/CMakeLists.txt
index c3ce5a145..2e0d95798 100644
--- a/gnuradio-core/src/lib/CMakeLists.txt
+++ b/gnuradio-core/src/lib/CMakeLists.txt
@@ -20,7 +20,7 @@
 ########################################################################
 # Setup compatibility checks and defines
 ########################################################################
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake)
 
 ########################################################################
 # Include subdirs rather to populate to the sources lists.
@@ -35,28 +35,28 @@ GR_INCLUDE_SUBDIRECTORY(reed-solomon)
 GR_INCLUDE_SUBDIRECTORY(io)
 GR_INCLUDE_SUBDIRECTORY(hier)
 
-LIST(APPEND gnuradio_core_sources bug_work_around_6.cc)
-LIST(APPEND test_gnuradio_core_sources bug_work_around_6.cc)
+list(APPEND gnuradio_core_sources bug_work_around_6.cc)
+list(APPEND test_gnuradio_core_sources bug_work_around_6.cc)
 
 ########################################################################
 # Setup the include and linker paths
 ########################################################################
-INCLUDE_DIRECTORIES(${GNURADIO_CORE_INCLUDE_DIRS})
+include_directories(${GNURADIO_CORE_INCLUDE_DIRS})
 
-INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
 
-ADD_DEFINITIONS(${GSL_DEFINITIONS})
-INCLUDE_DIRECTORIES(${GSL_INCLUDE_DIRS})
-LINK_DIRECTORIES(${GSL_LIBRARY_DIRS})
+add_definitions(${GSL_DEFINITIONS})
+include_directories(${GSL_INCLUDE_DIRS})
+link_directories(${GSL_LIBRARY_DIRS})
 
-INCLUDE_DIRECTORIES(${FFTW3F_INCLUDE_DIRS})
-LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS})
+include_directories(${FFTW3F_INCLUDE_DIRS})
+link_directories(${FFTW3F_LIBRARY_DIRS})
 
 ########################################################################
 # Setup library
 ########################################################################
-LIST(APPEND gnuradio_core_libs
+list(APPEND gnuradio_core_libs
     gruel
     ${Boost_LIBRARIES}
     ${GSL_LIBRARIES}
@@ -64,18 +64,18 @@ LIST(APPEND gnuradio_core_libs
 )
 
 #need to link with librt on ubuntu 11.10 for shm_*
-IF(LINUX)
-    LIST(APPEND gnuradio_core_libs rt)
-ENDIF()
-
-ADD_LIBRARY(gnuradio-core SHARED ${gnuradio_core_sources})
-TARGET_LINK_LIBRARIES(gnuradio-core ${gnuradio_core_libs})
-SET_TARGET_PROPERTIES(gnuradio-core PROPERTIES DEFINE_SYMBOL "gnuradio_core_EXPORTS")
-SET_TARGET_PROPERTIES(gnuradio-core PROPERTIES SOVERSION ${LIBVER})
+if(LINUX)
+    list(APPEND gnuradio_core_libs rt)
+endif()
+
+add_library(gnuradio-core SHARED ${gnuradio_core_sources})
+target_link_libraries(gnuradio-core ${gnuradio_core_libs})
+set_target_properties(gnuradio-core PROPERTIES DEFINE_SYMBOL "gnuradio_core_EXPORTS")
+set_target_properties(gnuradio-core PROPERTIES SOVERSION ${LIBVER})
 #avoid fftw and gsl link in dependent libraries:
-SET_TARGET_PROPERTIES(gnuradio-core PROPERTIES LINK_INTERFACE_LIBRARIES "gruel")
+set_target_properties(gnuradio-core PROPERTIES LINK_INTERFACE_LIBRARIES "gruel")
 
-INSTALL(TARGETS gnuradio-core
+install(TARGETS gnuradio-core
     LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "core_runtime" # .so/.dylib file
     ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT "core_devel" # .lib file
     RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "core_runtime" # .dll file
@@ -84,9 +84,9 @@ INSTALL(TARGETS gnuradio-core
 ########################################################################
 # Setup executables
 ########################################################################
-ADD_EXECUTABLE(gnuradio-config-info gnuradio-config-info.cc)
-TARGET_LINK_LIBRARIES(gnuradio-config-info gnuradio-core ${Boost_LIBRARIES})
-INSTALL(
+add_executable(gnuradio-config-info gnuradio-config-info.cc)
+target_link_libraries(gnuradio-config-info gnuradio-core ${Boost_LIBRARIES})
+install(
     TARGETS gnuradio-config-info
     DESTINATION ${GR_RUNTIME_DIR}
     COMPONENT "core_runtime"
@@ -95,12 +95,12 @@ INSTALL(
 ########################################################################
 # Setup tests
 ########################################################################
-IF(ENABLE_TESTING)
+if(ENABLE_TESTING)
 
-INCLUDE_DIRECTORIES(${CPPUNIT_INCLUDE_DIRS})
-LINK_DIRECTORIES(${CPPUNIT_LIBRARY_DIRS})
+include_directories(${CPPUNIT_INCLUDE_DIRS})
+link_directories(${CPPUNIT_LIBRARY_DIRS})
 
-ADD_LIBRARY(test-gnuradio-core SHARED ${test_gnuradio_core_sources})
-TARGET_LINK_LIBRARIES(test-gnuradio-core gnuradio-core ${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES})
+add_library(test-gnuradio-core SHARED ${test_gnuradio_core_sources})
+target_link_libraries(test-gnuradio-core gnuradio-core ${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES})
 
-ENDIF(ENABLE_TESTING)
+endif(ENABLE_TESTING)
diff --git a/gnuradio-core/src/lib/filter/CMakeLists.txt b/gnuradio-core/src/lib/filter/CMakeLists.txt
index 4c6fcf642..da16cd60b 100644
--- a/gnuradio-core/src/lib/filter/CMakeLists.txt
+++ b/gnuradio-core/src/lib/filter/CMakeLists.txt
@@ -22,13 +22,13 @@
 ########################################################################
 
 #set the C language property on the assembly files so the compiler will pick them up
-FILE(GLOB gr_core_filter_asms ${CMAKE_CURRENT_SOURCE_DIR}/*.S)
-FOREACH(gr_core_filter_asm ${gr_core_filter_asms})
-    SET_PROPERTY(SOURCE ${gr_core_filter_asm} PROPERTY LANGUAGE C)
-ENDFOREACH(gr_core_filter_asm)
+file(GLOB gr_core_filter_asms ${CMAKE_CURRENT_SOURCE_DIR}/*.S)
+foreach(gr_core_filter_asm ${gr_core_filter_asms})
+    set_property(SOURCE ${gr_core_filter_asm} PROPERTY LANGUAGE C)
+endforeach(gr_core_filter_asm)
 
 #detect 32 or 64 bit compiler
-IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86|x86_64)$")
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86|x86_64)$")
     include(CheckTypeSize)
     check_type_size("void*" SIZEOF_VOID_P BUILTIN_TYPES_ONLY)
     if (${SIZEOF_VOID_P} EQUAL 8)
@@ -36,7 +36,7 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86|x86_64)$")
     else()
         set(CMAKE_SYSTEM_PROCESSOR_x86 32)
     endif()
-ENDIF()
+endif()
 
 ########################################################################
 # Generate the makefile.gen, then extract its sources:
@@ -49,7 +49,7 @@ ENDIF()
 #   - Create a python script (very generic) to perform generation.
 #   - This way the targets would depend only on their sources.
 ########################################################################
-EXECUTE_PROCESS(
+execute_process(
     COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -c "
 import os, sys
 sys.path.append('${GR_CORE_PYTHONPATH}')
@@ -63,20 +63,20 @@ generate_all()
     " WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-MACRO(FILTER_GEN_EXTRACT outvar ext)
-    EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import os; print ';'.join(
+macro(FILTER_GEN_EXTRACT outvar ext)
+    execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; print ';'.join(
         map(lambda x: os.path.join('${CMAKE_CURRENT_BINARY_DIR}', x.replace('\\\\', '').strip()),
         filter(lambda f: '${ext}' in f, open('${CMAKE_CURRENT_BINARY_DIR}/Makefile.gen').readlines()
     )))" OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE ${outvar})
-    FILE(TO_CMAKE_PATH "${${outvar}}" ${outvar})
-ENDMACRO(FILTER_GEN_EXTRACT)
+    file(TO_CMAKE_PATH "${${outvar}}" ${outvar})
+endmacro(FILTER_GEN_EXTRACT)
 
 FILTER_GEN_EXTRACT(generated_filter_sources ".cc")
 FILTER_GEN_EXTRACT(generated_filter_includes ".h")
 FILTER_GEN_EXTRACT(generated_filter_swigs ".i")
 
 #TODO simplify this list with a triple-threat for loop
-SET(generated_filter_deps
+set(generated_filter_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/generate_all.py
     ${CMAKE_CURRENT_SOURCE_DIR}/generate_gr_fir_XXX.py
     ${CMAKE_CURRENT_SOURCE_DIR}/generate_gr_fir_filter_XXX.py
@@ -108,7 +108,7 @@ SET(generated_filter_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/gri_fir_filter_with_buffer_XXX.h.t
 )
 
-ADD_CUSTOM_COMMAND(
+add_custom_command(
     OUTPUT
         ${generated_filter_sources}
         ${generated_filter_includes}
@@ -121,7 +121,7 @@ ADD_CUSTOM_COMMAND(
     VERBATIM
 )
 
-ADD_CUSTOM_TARGET(filter_generated DEPENDS
+add_custom_target(filter_generated DEPENDS
     ${generated_filter_sources}
     ${generated_filter_includes}
     ${generated_filter_swigs}
@@ -131,16 +131,16 @@ ADD_CUSTOM_TARGET(filter_generated DEPENDS
 # Add target specific files
 # May VOLK put a rest to all the insanity below.
 ########################################################################
-IF(MSVC)
-    LIST(APPEND gnuradio_core_sources
+if(MSVC)
+    list(APPEND gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_generic.cc
     )
-    LIST(APPEND test_gnuradio_core_sources
+    list(APPEND test_gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/qa_dotprod_generic.cc
     )
-ELSE(MSVC)
-IF(CMAKE_SYSTEM_PROCESSOR_x86)
-    LIST(APPEND gnuradio_core_sources
+else(MSVC)
+if(CMAKE_SYSTEM_PROCESSOR_x86)
+    list(APPEND gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_x86.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_sysconfig_x86.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/gr_cpu_x86.cc
@@ -158,16 +158,16 @@ IF(CMAKE_SYSTEM_PROCESSOR_x86)
         ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_ccf_x86.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/sse_debug.c
     )
-    LIST(APPEND test_gnuradio_core_sources
+    list(APPEND test_gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/qa_dotprod_x86.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/qa_float_dotprod_x86.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/qa_complex_dotprod_x86.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/qa_ccomplex_dotprod_x86.cc
     )
-ENDIF()
+endif()
 
-IF(CMAKE_SYSTEM_PROCESSOR_x86 AND ${CMAKE_SYSTEM_PROCESSOR_x86} EQUAL 64)
-    LIST(APPEND gnuradio_core_sources
+if(CMAKE_SYSTEM_PROCESSOR_x86 AND ${CMAKE_SYSTEM_PROCESSOR_x86} EQUAL 64)
+    list(APPEND gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_sse64.S
         ${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_3dnow64.S
         ${CMAKE_CURRENT_SOURCE_DIR}/complex_dotprod_3dnowext64.S
@@ -180,8 +180,8 @@ IF(CMAKE_SYSTEM_PROCESSOR_x86 AND ${CMAKE_SYSTEM_PROCESSOR_x86} EQUAL 64)
         ${CMAKE_CURRENT_SOURCE_DIR}/fcomplex_dotprod_sse64.S
         ${CMAKE_CURRENT_SOURCE_DIR}/short_dotprod_mmx64.S
     )
-ELSEIF(CMAKE_SYSTEM_PROCESSOR_x86 AND ${CMAKE_SYSTEM_PROCESSOR_x86} EQUAL 32)
-    LIST(APPEND gnuradio_core_sources
+elseif(CMAKE_SYSTEM_PROCESSOR_x86 AND ${CMAKE_SYSTEM_PROCESSOR_x86} EQUAL 32)
+    list(APPEND gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_sse.S
         ${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_3dnow.S
         ${CMAKE_CURRENT_SOURCE_DIR}/complex_dotprod_3dnowext.S
@@ -194,8 +194,8 @@ ELSEIF(CMAKE_SYSTEM_PROCESSOR_x86 AND ${CMAKE_SYSTEM_PROCESSOR_x86} EQUAL 32)
         ${CMAKE_CURRENT_SOURCE_DIR}/fcomplex_dotprod_sse.S
         ${CMAKE_CURRENT_SOURCE_DIR}/short_dotprod_mmx.S
     )
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
-    LIST(APPEND gnuradio_core_sources
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+    list(APPEND gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_powerpc.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_sysconfig_powerpc.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/gr_cpu_powerpc.cc
@@ -203,11 +203,11 @@ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
         ${CMAKE_CURRENT_SOURCE_DIR}/gr_altivec.c
         ${CMAKE_CURRENT_SOURCE_DIR}/dotprod_fff_altivec.c
     )
-    LIST(APPEND test_gnuradio_core_sources
+    list(APPEND test_gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/qa_dotprod_powerpc.cc
     )
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
-    LIST(APPEND gnuradio_core_sources
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+    list(APPEND gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_armv7_a.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_sysconfig_armv7_a.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/gr_cpu_armv7_a.cc
@@ -216,23 +216,23 @@ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
         ${CMAKE_CURRENT_SOURCE_DIR}/dotprod_ccf_armv7_a.c
         ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_ccf_armv7_a.cc
     )
-    LIST(APPEND test_gnuradio_core_sources
+    list(APPEND test_gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/qa_dotprod_armv7_a.cc
     )
-ELSE()
-    LIST(APPEND gnuradio_core_sources
+else()
+    list(APPEND gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_generic.cc
     )
-    LIST(APPEND test_gnuradio_core_sources
+    list(APPEND test_gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/qa_dotprod_generic.cc
     )
-ENDIF()
-ENDIF(MSVC)
+endif()
+endif(MSVC)
 
 ########################################################################
 # Append gnuradio-core library sources
 ########################################################################
-LIST(APPEND gnuradio_core_sources
+list(APPEND gnuradio_core_sources
     ${generated_filter_sources}
     ${CMAKE_CURRENT_SOURCE_DIR}/gri_fft_filter_fff_generic.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/gri_fft_filter_ccc_generic.cc
@@ -249,7 +249,7 @@ LIST(APPEND gnuradio_core_sources
 ########################################################################
 # Append gnuradio-core test sources
 ########################################################################
-LIST(APPEND test_gnuradio_core_sources
+list(APPEND test_gnuradio_core_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/qa_filter.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_fir_ccf.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_fir_fcc.cc
@@ -270,7 +270,7 @@ LIST(APPEND test_gnuradio_core_sources
 ########################################################################
 # Install runtime headers
 ########################################################################
-INSTALL(FILES
+install(FILES
     ${generated_filter_includes}
     ${CMAKE_CURRENT_SOURCE_DIR}/complex_dotprod_generic.h
     ${CMAKE_CURRENT_SOURCE_DIR}/complex_dotprod_x86.h
@@ -304,20 +304,20 @@ INSTALL(FILES
 ########################################################################
 # Install swig headers
 ########################################################################
-IF(ENABLE_PYTHON)
-INSTALL(FILES
+if(ENABLE_PYTHON)
+install(FILES
     ${generated_filter_swigs}
     ${CMAKE_CURRENT_SOURCE_DIR}/filter.i
     ${CMAKE_CURRENT_BINARY_DIR}/filter_generated.i
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
     COMPONENT "core_swig"
 )
-ENDIF(ENABLE_PYTHON)
+endif(ENABLE_PYTHON)
 
 ########################################################################
 # Handle triple-threat files that have cc, h, and i
 ########################################################################
-SET(gr_core_filter_triple_threats
+set(gr_core_filter_triple_threats
     gr_adaptive_fir_ccc
     gr_adaptive_fir_ccf
     gr_dc_blocker_cc
@@ -342,10 +342,10 @@ SET(gr_core_filter_triple_threats
     gr_pfb_clock_sync_fff
 )
 
-FOREACH(file_tt ${gr_core_filter_triple_threats})
-    LIST(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.cc)
-    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio COMPONENT "core_devel")
-    IF(ENABLE_PYTHON)
-        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "core_swig")
-    ENDIF(ENABLE_PYTHON)
-ENDFOREACH(file_tt ${gr_core_filter_triple_threats})
+foreach(file_tt ${gr_core_filter_triple_threats})
+    list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.cc)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio COMPONENT "core_devel")
+    if(ENABLE_PYTHON)
+        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "core_swig")
+    endif(ENABLE_PYTHON)
+endforeach(file_tt ${gr_core_filter_triple_threats})
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
index ab6201de1..0445e251e 100644
--- a/gnuradio-core/src/lib/general/CMakeLists.txt
+++ b/gnuradio-core/src/lib/general/CMakeLists.txt
@@ -24,7 +24,7 @@
 ########################################################################
 # Handle the generated sine table
 ########################################################################
-ADD_CUSTOM_COMMAND(
+add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sine_table.h
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gen_sine_table.py
     COMMAND ${PYTHON_EXECUTABLE}
@@ -32,7 +32,7 @@ ADD_CUSTOM_COMMAND(
         ${CMAKE_CURRENT_BINARY_DIR}/sine_table.h
 )
 
-INCLUDE(AddFileDependencies)
+include(AddFileDependencies)
 ADD_FILE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/gr_fxpt.cc
     ${CMAKE_CURRENT_BINARY_DIR}/sine_table.h
 )
@@ -40,33 +40,33 @@ ADD_FILE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/gr_fxpt.cc
 ########################################################################
 # Handle the generated constants
 ########################################################################
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c
+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
     "import time;print time.strftime('%a, %d %b %Y %H:%M:%S', time.gmtime())"
     OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE
 )
-MESSAGE(STATUS "Loading build date ${BUILD_DATE} into gr_constants...")
+message(STATUS "Loading build date ${BUILD_DATE} into gr_constants...")
 
-MESSAGE(STATUS "Loading version ${VERSION} into gr_constants...")
+message(STATUS "Loading version ${VERSION} into gr_constants...")
 
-FILE(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}"     SYSCONFDIR)
-FILE(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_PKG_CONF_DIR}" GR_PREFSDIR)
+file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}"     SYSCONFDIR)
+file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_PKG_CONF_DIR}" GR_PREFSDIR)
 
 #double escape for windows backslash path separators
-STRING(REPLACE "\\" "\\\\" prefix ${prefix})
-STRING(REPLACE "\\" "\\\\" SYSCONFDIR ${SYSCONFDIR})
-STRING(REPLACE "\\" "\\\\" GR_PREFSDIR ${GR_PREFSDIR})
+string(REPLACE "\\" "\\\\" prefix ${prefix})
+string(REPLACE "\\" "\\\\" SYSCONFDIR ${SYSCONFDIR})
+string(REPLACE "\\" "\\\\" GR_PREFSDIR ${GR_PREFSDIR})
 
-CONFIGURE_FILE(
+configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_constants.cc.in
     ${CMAKE_CURRENT_BINARY_DIR}/gr_constants.cc
 @ONLY)
 
-LIST(APPEND gnuradio_core_sources ${CMAKE_CURRENT_BINARY_DIR}/gr_constants.cc)
+list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_BINARY_DIR}/gr_constants.cc)
 
 ########################################################################
 # Append gnuradio-core library sources
 ########################################################################
-LIST(APPEND gnuradio_core_sources
+list(APPEND gnuradio_core_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_circular_file.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_count_bits.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_fast_atan2f.cc
@@ -93,7 +93,7 @@ LIST(APPEND gnuradio_core_sources
 ########################################################################
 # Append gnuradio-core test sources
 ########################################################################
-LIST(APPEND test_gnuradio_core_sources
+list(APPEND test_gnuradio_core_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/qa_general.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_circular_file.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_cpm.cc
@@ -108,7 +108,7 @@ LIST(APPEND test_gnuradio_core_sources
 ########################################################################
 # Install runtime headers
 ########################################################################
-INSTALL(FILES
+install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_core_api.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_circular_file.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_constants.h
@@ -155,8 +155,8 @@ INSTALL(FILES
 ########################################################################
 # Install swig headers
 ########################################################################
-IF(ENABLE_PYTHON)
-INSTALL(FILES
+if(ENABLE_PYTHON)
+install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/general.i
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_constants.i
     ${CMAKE_CURRENT_SOURCE_DIR}/gri_agc_cc.i
@@ -167,12 +167,12 @@ INSTALL(FILES
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
     COMPONENT "core_swig"
 )
-ENDIF(ENABLE_PYTHON)
+endif(ENABLE_PYTHON)
 
 ########################################################################
 # Handle triple-threat files that have cc, h, and i
 ########################################################################
-SET(gr_core_general_triple_threats
+set(gr_core_general_triple_threats
     complex_vec_test
     gr_additive_scrambler_bb
     gr_agc_cc
@@ -292,10 +292,10 @@ SET(gr_core_general_triple_threats
     gr_correlate_access_code_tag_bb
 )
 
-FOREACH(file_tt ${gr_core_general_triple_threats})
-    LIST(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.cc)
-    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio COMPONENT "core_devel")
-    IF(ENABLE_PYTHON)
-        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "core_swig")
-    ENDIF(ENABLE_PYTHON)
-ENDFOREACH(file_tt ${gr_core_general_triple_threats})
+foreach(file_tt ${gr_core_general_triple_threats})
+    list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.cc)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio COMPONENT "core_devel")
+    if(ENABLE_PYTHON)
+        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "core_swig")
+    endif(ENABLE_PYTHON)
+endforeach(file_tt ${gr_core_general_triple_threats})
diff --git a/gnuradio-core/src/lib/gengen/CMakeLists.txt b/gnuradio-core/src/lib/gengen/CMakeLists.txt
index a223d291f..779ea0c47 100644
--- a/gnuradio-core/src/lib/gengen/CMakeLists.txt
+++ b/gnuradio-core/src/lib/gengen/CMakeLists.txt
@@ -24,7 +24,7 @@
 ########################################################################
 # generate the python helper script which calls into the build utils
 ########################################################################
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 #!${PYTHON_EXECUTABLE}
 
 import sys, os, re
@@ -45,37 +45,37 @@ if __name__ == '__main__':
 ########################################################################
 # generation helper macro to generate various files from template
 ########################################################################
-MACRO(expand_h_cc_i root)
+macro(expand_h_cc_i root)
 
-    FOREACH(ext h cc i)
+    foreach(ext h cc i)
         #make a list of all the generated files
-        UNSET(expanded_files_${ext})
-        FOREACH(sig ${ARGN})
-            STRING(REGEX REPLACE "X+" ${sig} name ${root})
-            LIST(APPEND expanded_files_${ext} ${CMAKE_CURRENT_BINARY_DIR}/${name}.${ext})
-        ENDFOREACH(sig)
+        unset(expanded_files_${ext})
+        foreach(sig ${ARGN})
+            string(REGEX REPLACE "X+" ${sig} name ${root})
+            list(APPEND expanded_files_${ext} ${CMAKE_CURRENT_BINARY_DIR}/${name}.${ext})
+        endforeach(sig)
 
         #create a command to generate the files
-        ADD_CUSTOM_COMMAND(
+        add_custom_command(
             OUTPUT ${expanded_files_${ext}}
             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.${ext}.t
             COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
                 ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
                 ${root} ${root}.${ext}.t ${ARGN}
         )
-    ENDFOREACH(ext)
+    endforeach(ext)
 
     #make source files depends on headers to force generation
-    SET_SOURCE_FILES_PROPERTIES(${expanded_files_cc}
+    set_source_files_properties(${expanded_files_cc}
         PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
     )
 
     #install rules for the generated cc, h, and i files
-    LIST(APPEND generated_gengen_sources ${expanded_files_cc})
-    LIST(APPEND generated_gengen_includes ${expanded_files_h})
-    LIST(APPEND generated_gengen_swigs ${expanded_files_i})
+    list(APPEND generated_gengen_sources ${expanded_files_cc})
+    list(APPEND generated_gengen_includes ${expanded_files_h})
+    list(APPEND generated_gengen_swigs ${expanded_files_i})
 
-ENDMACRO(expand_h_cc_i)
+endmacro(expand_h_cc_i)
 
 ########################################################################
 # Invoke macro to generate various sources
@@ -110,7 +110,7 @@ expand_h_cc_i(gr_argmax_XX                    fs is ss)
 expand_h_cc_i(gr_max_XX                       ff ii ss)
 expand_h_cc_i(gr_peak_detector_XX             fb ib sb)
 
-ADD_CUSTOM_TARGET(gengen_generated DEPENDS
+add_custom_target(gengen_generated DEPENDS
     ${generated_gengen_includes}
     ${generated_gengen_swigs}
 )
@@ -118,32 +118,32 @@ ADD_CUSTOM_TARGET(gengen_generated DEPENDS
 ########################################################################
 # Create the master gengen swig include files
 ########################################################################
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i "
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i "
 //
 // This file is machine generated.  All edits will be overwritten
 //
 ")
 
-FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i "%{\n")
-FOREACH(swig_file ${generated_gengen_swigs})
-    GET_FILENAME_COMPONENT(name ${swig_file} NAME_WE)
-    FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i "#include<${name}.h>\n")
-ENDFOREACH(swig_file)
-FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i "%}\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i "%{\n")
+foreach(swig_file ${generated_gengen_swigs})
+    get_filename_component(name ${swig_file} NAME_WE)
+    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i "#include<${name}.h>\n")
+endforeach(swig_file)
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i "%}\n")
 
-FOREACH(swig_file ${generated_gengen_swigs})
-    GET_FILENAME_COMPONENT(name ${swig_file} NAME)
-    FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i "%include<${name}>\n")
-ENDFOREACH(swig_file)
+foreach(swig_file ${generated_gengen_swigs})
+    get_filename_component(name ${swig_file} NAME)
+    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i "%include<${name}>\n")
+endforeach(swig_file)
 
 ########################################################################
 # Handle the generated sources + a few non-generated ones
 ########################################################################
-LIST(APPEND gnuradio_core_sources
+list(APPEND gnuradio_core_sources
     ${generated_gengen_sources}
 )
 
-INSTALL(FILES
+install(FILES
     ${generated_gengen_includes}
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_endianness.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_noise_type.h
@@ -152,8 +152,8 @@ INSTALL(FILES
     COMPONENT "core_devel"
 )
 
-IF(ENABLE_PYTHON)
-    INSTALL(FILES
+if(ENABLE_PYTHON)
+    install(FILES
         ${generated_gengen_swigs}
         ${CMAKE_CURRENT_SOURCE_DIR}/gr_endianness.i
         ${CMAKE_CURRENT_SOURCE_DIR}/gengen.i
@@ -161,4 +161,4 @@ IF(ENABLE_PYTHON)
         DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
         COMPONENT "core_swig"
     )
-ENDIF(ENABLE_PYTHON)
+endif(ENABLE_PYTHON)
diff --git a/gnuradio-core/src/lib/hier/CMakeLists.txt b/gnuradio-core/src/lib/hier/CMakeLists.txt
index fb922f60e..192dd5939 100644
--- a/gnuradio-core/src/lib/hier/CMakeLists.txt
+++ b/gnuradio-core/src/lib/hier/CMakeLists.txt
@@ -20,23 +20,23 @@
 ########################################################################
 # This file included, use CMake directory variables
 ########################################################################
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-LIST(APPEND gnuradio_core_sources
+list(APPEND gnuradio_core_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_channel_model.cc
 )
 
-INSTALL(FILES
+install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_channel_model.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio
     COMPONENT "core_devel"
 )
 
-IF(ENABLE_PYTHON)
-    INSTALL(FILES
+if(ENABLE_PYTHON)
+    install(FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/hier.i
         ${CMAKE_CURRENT_SOURCE_DIR}/gr_channel_model.i
         DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
         COMPONENT "core_swig"
     )
-ENDIF(ENABLE_PYTHON)
+endif(ENABLE_PYTHON)
diff --git a/gnuradio-core/src/lib/io/CMakeLists.txt b/gnuradio-core/src/lib/io/CMakeLists.txt
index 7ffe8306e..af9d7583c 100644
--- a/gnuradio-core/src/lib/io/CMakeLists.txt
+++ b/gnuradio-core/src/lib/io/CMakeLists.txt
@@ -24,7 +24,7 @@
 ########################################################################
 # Append gnuradio-core library sources
 ########################################################################
-LIST(APPEND gnuradio_core_sources
+list(APPEND gnuradio_core_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_histo_sink_f.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_oscope_guts.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_oscope_sink_f.cc
@@ -43,7 +43,7 @@ LIST(APPEND gnuradio_core_sources
 ########################################################################
 # Install runtime headers
 ########################################################################
-INSTALL(FILES
+install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_histo_sink_f.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_oscope_guts.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_oscope_sink_f.h
@@ -66,20 +66,20 @@ INSTALL(FILES
 ########################################################################
 # Install swig headers
 ########################################################################
-IF(ENABLE_PYTHON)
-INSTALL(FILES
+if(ENABLE_PYTHON)
+install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/io.i
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_histo_sink.i
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_oscope_sink.i
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
     COMPONENT "core_swig"
 )
-ENDIF(ENABLE_PYTHON)
+endif(ENABLE_PYTHON)
 
 ########################################################################
 # Handle triple-threat files that have cc, h, and i
 ########################################################################
-SET(gr_core_io_triple_threats
+set(gr_core_io_triple_threats
     gr_file_sink
     gr_file_sink_base
     gr_file_source
@@ -99,10 +99,10 @@ SET(gr_core_io_triple_threats
     gr_tagged_file_sink
 )
 
-FOREACH(file_tt ${gr_core_io_triple_threats})
-    LIST(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.cc)
-    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio COMPONENT "core_devel")
-    IF(ENABLE_PYTHON)
-        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "core_swig")
-    ENDIF(ENABLE_PYTHON)
-ENDFOREACH(file_tt ${gr_core_io_triple_threats})
+foreach(file_tt ${gr_core_io_triple_threats})
+    list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.cc)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio COMPONENT "core_devel")
+    if(ENABLE_PYTHON)
+        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "core_swig")
+    endif(ENABLE_PYTHON)
+endforeach(file_tt ${gr_core_io_triple_threats})
diff --git a/gnuradio-core/src/lib/missing/CMakeLists.txt b/gnuradio-core/src/lib/missing/CMakeLists.txt
index fb4620452..0a376645f 100644
--- a/gnuradio-core/src/lib/missing/CMakeLists.txt
+++ b/gnuradio-core/src/lib/missing/CMakeLists.txt
@@ -21,12 +21,12 @@
 # This file included, use CMake directory variables
 ########################################################################
 
-LIST(APPEND gnuradio_core_sources
+list(APPEND gnuradio_core_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/bug_work_around_8.cc
 )
 
-IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
-    LIST(APPEND gnuradio_core_sources
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+    list(APPEND gnuradio_core_sources
         ${CMAKE_CURRENT_SOURCE_DIR}/posix_memalign.cc
     )
-ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
diff --git a/gnuradio-core/src/lib/reed-solomon/CMakeLists.txt b/gnuradio-core/src/lib/reed-solomon/CMakeLists.txt
index 5640b12a2..f073249f6 100644
--- a/gnuradio-core/src/lib/reed-solomon/CMakeLists.txt
+++ b/gnuradio-core/src/lib/reed-solomon/CMakeLists.txt
@@ -24,15 +24,15 @@
 #So ifdef a max array bounds that is larger than NN and NROOTS
 #Its a bit of a hack, but if you look at the code, its so full of ifdefs,
 #and lacks optimization where it should be pre-allocating these arrays.
-IF(MSVC)
-    SET_SOURCE_FILES_PROPERTIES(
+if(MSVC)
+    set_source_files_properties(
         ${CMAKE_CURRENT_SOURCE_DIR}/exercise.c
         ${CMAKE_CURRENT_SOURCE_DIR}/decode_rs.c
         PROPERTIES COMPILE_DEFINITIONS "MAX_ARRAY=256;"
     )
-ENDIF(MSVC)
+endif(MSVC)
 
-SET(gr_core_rs_sources
+set(gr_core_rs_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/encode_rs.c
     ${CMAKE_CURRENT_SOURCE_DIR}/decode_rs.c
     ${CMAKE_CURRENT_SOURCE_DIR}/init_rs.c
@@ -41,9 +41,9 @@ SET(gr_core_rs_sources
 ########################################################################
 # Setup sources and includes
 ########################################################################
-LIST(APPEND gnuradio_core_sources ${gr_core_rs_sources})
+list(APPEND gnuradio_core_sources ${gr_core_rs_sources})
 
-INSTALL(
+install(
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/rs.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio
     COMPONENT "core_devel"
@@ -52,11 +52,11 @@ INSTALL(
 ########################################################################
 # Register unit tests
 ########################################################################
-IF(ENABLE_TESTING)
-ADD_EXECUTABLE(gr_core_rstest
+if(ENABLE_TESTING)
+add_executable(gr_core_rstest
     ${gr_core_rs_sources}
     ${CMAKE_CURRENT_SOURCE_DIR}/rstest.c
     ${CMAKE_CURRENT_SOURCE_DIR}/exercise.c
 )
-ADD_TEST(gr-core-reed-solomon-test gr_core_rstest)
-ENDIF(ENABLE_TESTING)
+add_test(gr-core-reed-solomon-test gr_core_rstest)
+endif(ENABLE_TESTING)
diff --git a/gnuradio-core/src/lib/runtime/CMakeLists.txt b/gnuradio-core/src/lib/runtime/CMakeLists.txt
index 4b1f85bbe..52cb39c40 100644
--- a/gnuradio-core/src/lib/runtime/CMakeLists.txt
+++ b/gnuradio-core/src/lib/runtime/CMakeLists.txt
@@ -24,7 +24,7 @@
 ########################################################################
 # Append gnuradio-core library sources
 ########################################################################
-LIST(APPEND gnuradio_core_sources
+list(APPEND gnuradio_core_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_basic_block.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_flowgraph.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_flat_flowgraph.cc
@@ -70,7 +70,7 @@ LIST(APPEND gnuradio_core_sources
 ########################################################################
 # Append gnuradio-core test sources
 ########################################################################
-LIST(APPEND test_gnuradio_core_sources
+list(APPEND test_gnuradio_core_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_block.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_hier_block2.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_hier_block2_derived.cc
@@ -87,7 +87,7 @@ LIST(APPEND test_gnuradio_core_sources
 ########################################################################
 # Install runtime headers
 ########################################################################
-INSTALL(FILES
+install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_basic_block.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_flowgraph.h
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_flat_flowgraph.h
@@ -136,8 +136,8 @@ INSTALL(FILES
 ########################################################################
 # Install swig headers
 ########################################################################
-IF(ENABLE_PYTHON)
-INSTALL(FILES
+if(ENABLE_PYTHON)
+install(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_basic_block.i
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_block.i
     ${CMAKE_CURRENT_SOURCE_DIR}/gr_block_detail.i
@@ -159,4 +159,4 @@ INSTALL(FILES
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
     COMPONENT "core_swig"
 )
-ENDIF(ENABLE_PYTHON)
+endif(ENABLE_PYTHON)
diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt
index 9c7a75b4f..ef0772944 100644
--- a/gnuradio-core/src/lib/swig/CMakeLists.txt
+++ b/gnuradio-core/src/lib/swig/CMakeLists.txt
@@ -18,20 +18,20 @@
 # Boston, MA 02110-1301, USA.
 
 ########################################################################
-INCLUDE(GrPython)
-INCLUDE(GrSwig)
+include(GrPython)
+include(GrSwig)
 
-INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
 
-SET(GR_SWIG_INCLUDE_DIRS
+set(GR_SWIG_INCLUDE_DIRS
     ${Boost_INCLUDE_DIRS}
     ${GSL_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
     ${GNURADIO_CORE_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}
 )
-SET(GR_SWIG_LIBRARIES gnuradio-core)
+set(GR_SWIG_LIBRARIES gnuradio-core)
 
 ########################################################################
 # Build and install the swig targets
@@ -43,7 +43,7 @@ SET(GR_SWIG_LIBRARIES gnuradio-core)
 # X86_64, g++'s resident set size was 650MB!
 # ----------------------------------------------------------------
 
-SET(GR_SWIG_TARGET_DEPS gengen_generated filter_generated)
+set(GR_SWIG_TARGET_DEPS gengen_generated filter_generated)
 
 GR_SWIG_MAKE(gnuradio_core_runtime gnuradio_core_runtime.i)
 GR_SWIG_MAKE(gnuradio_core_general gnuradio_core_general.i)
@@ -66,7 +66,7 @@ GR_SWIG_INSTALL(TARGETS
 ########################################################################
 # Install various files
 ########################################################################
-INSTALL(FILES
+install(FILES
     gnuradio.i
     gr_swig_block_magic.i
     gr_shared_ptr.i
@@ -86,7 +86,7 @@ GR_PYTHON_INSTALL(
     COMPONENT "core_python"
 )
 
-INSTALL(
+install(
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio_swig_bug_workaround.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio
     COMPONENT "core_swig"
diff --git a/gnuradio-core/src/lib/viterbi/CMakeLists.txt b/gnuradio-core/src/lib/viterbi/CMakeLists.txt
index aeb8a012d..add5c77e8 100644
--- a/gnuradio-core/src/lib/viterbi/CMakeLists.txt
+++ b/gnuradio-core/src/lib/viterbi/CMakeLists.txt
@@ -21,7 +21,7 @@
 # This file included, use CMake directory variables
 ########################################################################
 
-SET(viterbi_sources
+set(viterbi_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/metrics.c
     ${CMAKE_CURRENT_SOURCE_DIR}/tab.c
     ${CMAKE_CURRENT_SOURCE_DIR}/viterbi.c
@@ -30,25 +30,25 @@ SET(viterbi_sources
 ########################################################################
 # define missing erf function with C linkage (hack for metrics.c)
 ########################################################################
-IF(MSVC)
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/boost_math_erf.cc "
+if(MSVC)
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/boost_math_erf.cc "
 #include <boost/math/special_functions/erf.hpp>
 extern \"C\" double erf(double x){
     return boost::math::erf(x);
 }
 ")
-LIST(APPEND viterbi_sources ${CMAKE_CURRENT_BINARY_DIR}/boost_math_erf.cc)
-ENDIF(MSVC)
+list(APPEND viterbi_sources ${CMAKE_CURRENT_BINARY_DIR}/boost_math_erf.cc)
+endif(MSVC)
 
 ########################################################################
 # Append gnuradio-core library sources
 ########################################################################
-LIST(APPEND gnuradio_core_sources ${viterbi_sources})
+list(APPEND gnuradio_core_sources ${viterbi_sources})
 
 ########################################################################
 # Install runtime headers
 ########################################################################
-INSTALL(
+install(
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/viterbi.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio
     COMPONENT "core_devel"