diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ac66a33..e6e12e70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,7 +165,7 @@ endif( NOT DEFINED FULL_MAKE_COMMAND )
 
 
 if( NOT DEFINED MAKE_COMMAND )
-  GET_FILENAME_COMPONENT( MAKE_COMMAND "${FULL_MAKE_COMMAND}" NAME )
+  get_filename_component( MAKE_COMMAND "${FULL_MAKE_COMMAND}" NAME )
 endif( NOT DEFINED MAKE_COMMAND )
 
 
diff --git a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src
index d2fabc7a..9e3b5385 100644
--- a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src
+++ b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt.src
@@ -1,16 +1,16 @@
 #this is just a basic CMakeLists.txt, for more information see the cmake manpage
 
 #add definitions, compiler switches, etc.
-ADD_DEFINITIONS(-Wall -O2)
+add_definitions(-Wall -O2)
 
 #build a shared library
-ADD_LIBRARY(%{APPNAMELC} SHARED %{APPNAMELC}.c)
+add_library(%{APPNAMELC} SHARED %{APPNAMELC}.c)
 
 #for testing the shared library you probably need some test app too
-ADD_EXECUTABLE(%{APPNAMELC}test %{APPNAMELC}test.c)
+add_executable(%{APPNAMELC}test %{APPNAMELC}test.c)
 
 #need to link to some other libraries ? just add them here
-TARGET_LINK_LIBRARIES(%{APPNAMELC}test %{APPNAMELC})
+target_link_libraries(%{APPNAMELC}test %{APPNAMELC})
 
 #add an install target here
 #INSTALL_FILES(...)
diff --git a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src
index ee2bb832..6450c4b9 100644
--- a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src
+++ b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt.src
@@ -1,16 +1,16 @@
 #this is just a basic CMakeLists.txt, for more information see the cmake manpage
 
 #add definitions, compiler switches, etc.
-ADD_DEFINITIONS(-Wall -O2)
+add_definitions(-Wall -O2)
 
 #build a shared library
-ADD_LIBRARY(%{APPNAMELC} SHARED %{APPNAMELC}.cpp)
+add_library(%{APPNAMELC} SHARED %{APPNAMELC}.cpp)
 
 #for testing the shared library you probably need some test app too
-ADD_EXECUTABLE(%{APPNAMELC}test %{APPNAMELC}test.cpp)
+add_executable(%{APPNAMELC}test %{APPNAMELC}test.cpp)
 
 #need to link to some other libraries ? just add them here
-TARGET_LINK_LIBRARIES(%{APPNAMELC}test %{APPNAMELC})
+target_link_libraries(%{APPNAMELC}test %{APPNAMELC})
 
 #add an install target here
 #INSTALL_FILES(...)
diff --git a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src
index 6122c34f..f78028c9 100644
--- a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src
+++ b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src
@@ -2,26 +2,26 @@
 # for more information see the cmake man page
 
 # add definitions, compiler switches, etc.
-ADD_DEFINITIONS(${QT_DEFINITIONS} -Wall -O2 -g)
+add_definitions(${QT_DEFINITIONS} -Wall -O2 -g)
 
 # add the Qt include dir to the include path
-INCLUDE_DIRECTORIES(${TQT_INCLUDE_DIR})
+include_directories(${TQT_INCLUDE_DIR})
 
 # list all source files in a variable
-SET(%{APPNAMELC}_SRCS main.cpp %{APPNAMELC}.cpp)
+set(%{APPNAMELC}_SRCS main.cpp %{APPNAMELC}.cpp)
 
 # specify the headers which have to be processed by moc
 # and collect the results in the variable given above
-QT_WRAP_CPP (%{APPNAMELC} %{APPNAMELC}_SRCS %{APPNAMELC}.h)
+qt_wrap_cpp (%{APPNAMELC} %{APPNAMELC}_SRCS %{APPNAMELC}.h)
 
 # create tan executable from the list of source files
-ADD_EXECUTABLE(%{APPNAMELC} ${%{APPNAMELC}_SRCS})
+add_executable(%{APPNAMELC} ${%{APPNAMELC}_SRCS})
 
 # link the application to the Qt libs
-TARGET_LINK_LIBRARIES(%{APPNAMELC} ${TQT_LIBRARIES} )
+target_link_libraries(%{APPNAMELC} ${TQT_LIBRARIES} )
 
 # create an install rule for the executable
-INSTALL(TARGETS %{APPNAMELC} DESTINATION bin )
+install(TARGETS %{APPNAMELC} DESTINATION bin )
 
 # if you need to install more things, take a look at the install() command
 # in the cmake man page