diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6aa42f341acf9b67b5ffdd6c15adb73a57e5c010..a26cb3f9b81483a9b3807caccdaffacf37385882 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,8 +3,8 @@ find_package (GTest REQUIRED)
 set (TEST_EXE opal_unit_tests)
 set (SRC_DIRS classic_src opal_src)
 
-add_compile_options (${IPPL_CMAKE_CXX_FLAGS} )
-add_definitions (-DPARALLEL_IO -DWITH_UNIT_TESTS)
+add_definitions (-DPARALLEL_IO)
+add_definitions (-DWITH_UNIT_TESTS)
 
 set (TEST_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 macro (add_sources)
@@ -79,3 +79,11 @@ target_link_libraries (
     ${GTEST_BOTH_LIBRARIES}
     pthread
 )
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/classic_src/AbsBeamline/CMakeLists.txt b/tests/classic_src/AbsBeamline/CMakeLists.txt
index 36c06457622004a5bc76bdc7e6b2205bdc901016..81e6d2fd2c17152a3de99819262537ca9248702d 100644
--- a/tests/classic_src/AbsBeamline/CMakeLists.txt
+++ b/tests/classic_src/AbsBeamline/CMakeLists.txt
@@ -16,3 +16,11 @@ include_directories (
 )
 
 add_sources(${_SRCS})
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/classic_src/Algorithms/CMakeLists.txt b/tests/classic_src/Algorithms/CMakeLists.txt
index 027e46ee363c80544e4d53e6d71066fc21f42038..d6b84ff8b7814bb898aedd9e0cb2a9490acba6de 100644
--- a/tests/classic_src/Algorithms/CMakeLists.txt
+++ b/tests/classic_src/Algorithms/CMakeLists.txt
@@ -7,4 +7,12 @@ include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_sources(${_SRCS})
\ No newline at end of file
+add_sources(${_SRCS})
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/classic_src/CMakeLists.txt b/tests/classic_src/CMakeLists.txt
index 435aed0a0795f2f79334f6f97b424cacc241a2f9..55f65940e83f0124b4b7671569390ba96ba61395 100644
--- a/tests/classic_src/CMakeLists.txt
+++ b/tests/classic_src/CMakeLists.txt
@@ -5,3 +5,11 @@ add_subdirectory (Fields)
 
 
 set (TEST_SRCS_LOCAL ${TEST_SRCS_LOCAL} PARENT_SCOPE)
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/classic_src/Fields/CMakeLists.txt b/tests/classic_src/Fields/CMakeLists.txt
index 70e8be9cb1bbbeb0b59a12847c25140e0601fdb7..5747fdd5144dc77635d2885152b96739819d5d9b 100644
--- a/tests/classic_src/Fields/CMakeLists.txt
+++ b/tests/classic_src/Fields/CMakeLists.txt
@@ -1,3 +1,11 @@
 add_subdirectory (Interpolation)
 
 set (TEST_SRCS_LOCAL ${TEST_SRCS_LOCAL} PARENT_SCOPE)
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/classic_src/Fields/Interpolation/CMakeLists.txt b/tests/classic_src/Fields/Interpolation/CMakeLists.txt
index d164ba7b1bd22ac467cb7e8a036aeb67d36e7c7f..055062931d8cbf109b4dc7d0a97d59e2f9689ad1 100644
--- a/tests/classic_src/Fields/Interpolation/CMakeLists.txt
+++ b/tests/classic_src/Fields/Interpolation/CMakeLists.txt
@@ -13,3 +13,10 @@ include_directories (
 
 add_sources(${_SRCS})
 
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/classic_src/Utilities/CMakeLists.txt b/tests/classic_src/Utilities/CMakeLists.txt
index 5b97e3fd5c06c10ef183ff05b1a5bdddfa4ccd0f..539af2604879ea664289559acd93b8f0e99fd8d4 100644
--- a/tests/classic_src/Utilities/CMakeLists.txt
+++ b/tests/classic_src/Utilities/CMakeLists.txt
@@ -8,4 +8,12 @@ include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_sources(${_SRCS})
\ No newline at end of file
+add_sources(${_SRCS})
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/ippl_src/CMakeLists.txt b/tests/ippl_src/CMakeLists.txt
index e760d0c0efd1042f9fd746a70698e81df3d7e6d0..bf22d59e31d7bacf228af0b64fcdf9b69f681b04 100644
--- a/tests/ippl_src/CMakeLists.txt
+++ b/tests/ippl_src/CMakeLists.txt
@@ -1,3 +1,11 @@
 add_subdirectory (Particle)
 
-set (TEST_SRCS_LOCAL ${TEST_SRCS_LOCAL} PARENT_SCOPE)
\ No newline at end of file
+set (TEST_SRCS_LOCAL ${TEST_SRCS_LOCAL} PARENT_SCOPE)
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/ippl_src/Particle/CMakeLists.txt b/tests/ippl_src/Particle/CMakeLists.txt
index 682e3d93857e52514eb6c6da798da83a8fa9df57..75d31c5cda575aa119773b28bddf62ecf9bbd9b0 100644
--- a/tests/ippl_src/Particle/CMakeLists.txt
+++ b/tests/ippl_src/Particle/CMakeLists.txt
@@ -6,4 +6,12 @@ include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_sources(${_SRCS})
\ No newline at end of file
+add_sources(${_SRCS})
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/opal_src/BasicActions/CMakeLists.txt b/tests/opal_src/BasicActions/CMakeLists.txt
index 17f19d8b6aa108ebe01a0ecf7e3a811dddf57da0..574e6f2973126367d9cfdfe891e33ef11e1ff085 100644
--- a/tests/opal_src/BasicActions/CMakeLists.txt
+++ b/tests/opal_src/BasicActions/CMakeLists.txt
@@ -8,3 +8,11 @@ include_directories (
 )
 
 add_sources(${_SRCS})
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/opal_src/CMakeLists.txt b/tests/opal_src/CMakeLists.txt
index c0f6f98cd5817c6056541e8e537142ba79b63224..27a04ea33074e1660c655d0aa0f302adf2fb9aac 100644
--- a/tests/opal_src/CMakeLists.txt
+++ b/tests/opal_src/CMakeLists.txt
@@ -5,3 +5,11 @@ add_subdirectory (Sample)
 add_subdirectory (Utilities)
 
 set (TEST_SRCS_LOCAL ${TEST_SRCS_LOCAL} PARENT_SCOPE)
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/opal_src/Distribution/CMakeLists.txt b/tests/opal_src/Distribution/CMakeLists.txt
index bdf69ee04b817b8ac5b8058571c96e8fe19dd41f..ca8942ba32c922edc35935b01b22ece4899a1a2a 100644
--- a/tests/opal_src/Distribution/CMakeLists.txt
+++ b/tests/opal_src/Distribution/CMakeLists.txt
@@ -7,4 +7,12 @@ include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_sources(${_SRCS})
\ No newline at end of file
+add_sources(${_SRCS})
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/opal_src/Elements/CMakeLists.txt b/tests/opal_src/Elements/CMakeLists.txt
index 52b36a42ee523730a0bdb0404eb71e04170f436d..759d750eba8ad729aad470cadc7765c79d965121 100644
--- a/tests/opal_src/Elements/CMakeLists.txt
+++ b/tests/opal_src/Elements/CMakeLists.txt
@@ -10,4 +10,12 @@ include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_sources(${_SRCS})
\ No newline at end of file
+add_sources(${_SRCS})
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/opal_src/Sample/CMakeLists.txt b/tests/opal_src/Sample/CMakeLists.txt
index 23bdcb728b36693f80f31feacfa13eda28954429..1766245a66e6097a990efecd57a4947182da8e91 100644
--- a/tests/opal_src/Sample/CMakeLists.txt
+++ b/tests/opal_src/Sample/CMakeLists.txt
@@ -6,4 +6,12 @@ include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_sources(${_SRCS})
\ No newline at end of file
+add_sources(${_SRCS})
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/opal_src/Utilities/CMakeLists.txt b/tests/opal_src/Utilities/CMakeLists.txt
index 5e992df368613be999a8cc70a016bdc998d15b8a..815635ead77a19a1179500786296ad3d5ddd425c 100644
--- a/tests/opal_src/Utilities/CMakeLists.txt
+++ b/tests/opal_src/Utilities/CMakeLists.txt
@@ -5,4 +5,12 @@ include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_sources(${_SRCS})
\ No newline at end of file
+add_sources(${_SRCS})
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tests/opal_test_utilities/CMakeLists.txt b/tests/opal_test_utilities/CMakeLists.txt
index c9b80bef3c9f1d4c198d014f01405398c07b9121..86690e6338b4a2c676d91ae469fce3fb7e30a69e 100644
--- a/tests/opal_test_utilities/CMakeLists.txt
+++ b/tests/opal_test_utilities/CMakeLists.txt
@@ -7,3 +7,11 @@ include_directories (
 )
 
 add_sources(${_SRCS})
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index f667e4f96f9de252d5a3e287af0cd8203813feff..3555f2f8d475b344ce0f098405c3210c1086cecd 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -10,5 +10,13 @@ endif ()
 option (ENABLE_MSLANG "Compile MSLang stand-alone compiler" OFF)
 
 if (ENABLE_MSLANG)
-    ADD_SUBDIRECTORY(mslang)
+    add_subdirectory (mslang)
 endif ()
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tools/SDDSReader/CMakeLists.txt b/tools/SDDSReader/CMakeLists.txt
index 31dc038c50049eff224f59a4839d76108e558315..5e71967ab092b43eb8c9144200297f5a4409a767 100644
--- a/tools/SDDSReader/CMakeLists.txt
+++ b/tools/SDDSReader/CMakeLists.txt
@@ -1,22 +1,20 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.8.10)
-PROJECT (StandAloneSDDSReader)
-SET (StandAloneSDDSReader_VERSION_MAJOR 0)
-SET (StandAloneSDDSReader_VERSION_MINOR 1)
+cmake_minimum_required (VERSION 2.8.10)
+project (StandAloneSDDSReader)
+set (StandAloneSDDSReader_VERSION_MAJOR 0)
+set (StandAloneSDDSReader_VERSION_MINOR 1)
 
 configure_file(config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
 
-set (CMAKE_CXX_FLAGS
-    "${IPPL_CMAKE_CXX_FLAGS} -DPARALLEL_IO ${CMAKE_CXX_FLAGS}"
-    )
+add_definitions (-DPARALLEL_IO)
 
-SET (PARSERPATH "${CMAKE_SOURCE_DIR}/src/Structure")
+set (PARSERPATH "${CMAKE_SOURCE_DIR}/src/Structure")
 
-INCLUDE_DIRECTORIES (
+include_directories (
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_SOURCE_DIR}/src/Classic
 )
 
-SET (SRCS
+set (SRCS
   ${CMAKE_SOURCE_DIR}/src/Structure/SDDSParser.cpp
   ${CMAKE_SOURCE_DIR}/src/Structure/SDDSParser/array.cpp
   ${CMAKE_SOURCE_DIR}/src/Structure/SDDSParser/associate.cpp
@@ -32,14 +30,22 @@ SET (SRCS
   ${CMAKE_SOURCE_DIR}/src/Classic/Utilities/ClassicException.cpp
 )
 
-SET (LIBS
+set (LIBS
     ${Boost_LIBRARIES}
     ${MPI_LIBRARIES}
     z
     dl
 )
 
-ADD_EXECUTABLE( SDDSReader main.cpp ${SRCS})
-TARGET_LINK_LIBRARIES( SDDSReader ${LIBS} )
+add_executable (SDDSReader main.cpp ${SRCS})
+target_link_libraries (SDDSReader ${LIBS})
 
-INSTALL(TARGETS SDDSReader RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
\ No newline at end of file
+install (TARGETS SDDSReader RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tools/mslang/CMakeLists.txt b/tools/mslang/CMakeLists.txt
index 2fa30f82f33eae80d1e378bed94726dcd1fc5c95..89ca220a4e31ef099c0a18e836179f84b7aebd16 100644
--- a/tools/mslang/CMakeLists.txt
+++ b/tools/mslang/CMakeLists.txt
@@ -1,31 +1,28 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.8.10)
-cmake_policy(SET CMP0048 NEW)
-PROJECT (MSLANG VERSION 0.1)
-
-#SET (MSLANG_VERSION_MAJOR 0)
-#SET (MSLANG_VERSION_MINOR 1)
-
-SET (IPPL_CXX_FLAGS
-    "-DIPPL_LINUX -DIPPL_STRINGSTREAM -DIPPL_MPI -DMPICH_SKIP_MPICXX -DIPPL_DONT_POOL -DIPPL_USE_XDIV_RNG -DIPPL_USE_PARTIAL_SPECIALIZATION -Drestrict=__restrict__ -DNOCTAssert ${IPPL_CXX_FLAGS}"
-    )
-
- SET (CMAKE_CXX_FLAGS
-     "${OTHER_CXX_FLAGS} ${IPPL_CXX_FLAGS} ${CMAKE_CXX_FLAGS} "
-     )
-
-INCLUDE_DIRECTORIES (
+cmake_minimum_required (VERSION 2.8.10)
+cmake_policy (SET CMP0048 NEW)
+project (MSLANG)
+set (MSLANG_VERSION_MAJOR 0)
+set (MSLANG_VERSION_MINOR 1)
+
+add_definitions (-DIPPL_MPI)
+add_definitions (-DIPPL_DONT_POOL)
+add_definitions (-DIPPL_USE_XDIV_RNG)
+add_definitions (-DIPPL_USE_PARTIAL_SPECIALIZATION)
+add_definitions (-DNOCTAssert)
+
+include_directories (
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_SOURCE_DIR}/src/Classic
     ${CMAKE_SOURCE_DIR}/ippl/src
     ${GSL_INCLUDE_DIR}
 )
 
-LINK_DIRECTORIES (
+link_directories (
     ${IPPL_LIBRARY_DIR}
     ${CMAKE_SOURCE_DIR}/src
 )
 
-SET (MSLANG_LIBS
+set (MSLANG_LIBS
     libOPAL
     ${OPTP_LIBS}
     ${OPTP_LIBRARY}
@@ -39,8 +36,16 @@ SET (MSLANG_LIBS
     z
 )
 
-MESSAGE( STATUS "Compiling MSLang")
-ADD_EXECUTABLE( mslang mslang.cpp )
-TARGET_LINK_LIBRARIES( mslang ${MSLANG_LIBS} )
+message (STATUS "Compiling MSLang")
+add_executable (mslang mslang.cpp)
+target_link_libraries (mslang ${MSLANG_LIBS})
+
+install (TARGETS mslang RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
 
-INSTALL(TARGETS mslang RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tools/opal2sdds/CMakeLists.txt b/tools/opal2sdds/CMakeLists.txt
index c2ff828be8c69f58aaf380821515fd138ce9eddd..cbce59bd3d69270d235644acc7ad5e1ec6995d77 100644
--- a/tools/opal2sdds/CMakeLists.txt
+++ b/tools/opal2sdds/CMakeLists.txt
@@ -1,25 +1,23 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.8.10)
-PROJECT (OPAL2SDDS)
-SET (OPAL2SDDS_VERSION_MAJOR 0)
-SET (OPAL2SDDS_VERSION_MINOR 1)
+cmake_minimum_required (VERSION 2.8.10)
+project (OPAL2SDDS)
+set (OPAL2SDDS_VERSION_MAJOR 0)
+set (OPAL2SDDS_VERSION_MINOR 1)
 
 configure_file(config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
 
-set (CMAKE_CXX_FLAGS
-    "${IPPL_CMAKE_CXX_FLAGS} -DPARALLEL_IO ${CMAKE_CXX_FLAGS}"
-    )
+add_definitions (-DPARALLEL_IO)
 
-INCLUDE_DIRECTORIES (
+include_directories (
     ${SDDS_INCLUDE_DIR}
     ${H5Hut_INCLUDE_DIR}
     ${HDF5_INCLUDE_DIR}
 )
 
-LINK_DIRECTORIES (
+link_directories (
     ${SDDS_LIBRARY_DIR}
 )
 
-SET (SDDS_LIBS
+set (SDDS_LIBS
     mdbcommon
     SDDS1
     mdblib
@@ -31,7 +29,15 @@ SET (SDDS_LIBS
     dl
 )
 
-ADD_EXECUTABLE( opal2sdds main.cpp )
-TARGET_LINK_LIBRARIES( opal2sdds ${SDDS_LIBS} )
+add_executable (opal2sdds main.cpp)
+target_link_libraries (opal2sdds ${SDDS_LIBS})
 
 INSTALL(TARGETS opal2sdds RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End:
diff --git a/tools/sdds2opal/CMakeLists.txt b/tools/sdds2opal/CMakeLists.txt
index b0eec1795010c4dced2a2bd9ec455384a71fe6ee..b3ed720d97458166358f0390033db8180410d1cb 100644
--- a/tools/sdds2opal/CMakeLists.txt
+++ b/tools/sdds2opal/CMakeLists.txt
@@ -24,4 +24,12 @@ SET (SDDS_LIBS
 ADD_EXECUTABLE( sdds2opal main.cpp )
 TARGET_LINK_LIBRARIES( sdds2opal ${SDDS_LIBS} )
 
-INSTALL(TARGETS sdds2opal RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
\ No newline at end of file
+INSTALL(TARGETS sdds2opal RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
+
+# vi: set et ts=4 sw=4 sts=4:
+  
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# End: