diff --git a/pub/cmake/modules/FindGSL.cmake b/pub/cmake/modules/FindGSL.cmake
index a7d1048d6b347ec4ca6d3a9fdd69579d9694f4f3..20f7d3669d0546f77d937acb2960e1f6a17e62f2 100644
--- a/pub/cmake/modules/FindGSL.cmake
+++ b/pub/cmake/modules/FindGSL.cmake
@@ -114,7 +114,7 @@ else( WIN32 AND NOT CYGWIN AND NOT MSYS )
         set( GSL_FOUND FALSE )
       endif( RET EQUAL 0 )
        
-      MARK_AS_ADVANCED(
+      mark_as_advanced(
         GSL_CFLAGS
       )
       message( STATUS "Using GSL from ${GSL_PREFIX}" )
diff --git a/pub/cmake/modules/FindReadline.cmake b/pub/cmake/modules/FindReadline.cmake
index 12e1046b14d119a087def97396da46558db1924c..0b2560bfd5fdabc017c986d835666658b8249761 100644
--- a/pub/cmake/modules/FindReadline.cmake
+++ b/pub/cmake/modules/FindReadline.cmake
@@ -18,14 +18,14 @@
 #=============================================================================
 # (To distribute this file outside of CMake, substitute the full
 # License text for the above reference.)
-FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h )
-FIND_LIBRARY(READLINE_LIBRARIES NAMES readline history READLINE )
+find_path(READLINE_INCLUDE_DIR readline/readline.h )
+find_library(READLINE_LIBRARIES NAMES readline history READLINE )
 # handle the QUIETLY and REQUIRED arguments and set READLINE_FOUND to TRUE if
 # all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(READLINE DEFAULT_MSG READLINE_LIBRARIES READLINE_INCLUDE_DIR)
 IF (READLINE_FOUND)
-INCLUDE(CheckLibraryExists)
+include(CheckLibraryExists)
 CHECK_LIBRARY_EXISTS(${READLINE_LIBRARIES} rl_initialize "" READLINE_NEED_PREFIX)
 ENDIF (READLINE_FOUND)
-MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARIES)
\ No newline at end of file
+mark_as_advanced(READLINE_INCLUDE_DIR READLINE_LIBRARIES)
\ No newline at end of file
diff --git a/pub/lib/CMakeLists.txt b/pub/lib/CMakeLists.txt
index 26fdd55152b9bd0f5337191b5b84c17d8d587fd2..4d8de06ee6962c33b8e768fc3d6cb4090e13cfe9 100644
--- a/pub/lib/CMakeLists.txt
+++ b/pub/lib/CMakeLists.txt
@@ -1,16 +1,16 @@
 # frida: lib/CMakeLists.txt
 
-BISON_TARGET(xaxyacc
+bison_target(xaxyacc
 xax_yacc.ypp ${CMAKE_CURRENT_BINARY_DIR}/xax_yacc.cpp COMPILE_FLAGS "-p xax -y" )
-FLEX_TARGET(xaxlex
+flex_target(xaxlex
 xax_lex.lpp  ${CMAKE_CURRENT_BINARY_DIR}/xax_lex.cpp COMPILE_FLAGS "-Pxax" )
-ADD_FLEX_BISON_DEPENDENCY(xaxlex xaxyacc)
+add_flex_bison_dependency(xaxlex xaxyacc)
 
-INCLUDE_DIRECTORIES(${Frida_SOURCE_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${Frida_SOURCE_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR})
 
-CONFIGURE_FILE ("config.hpp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.hpp")
+configure_file("config.hpp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.hpp")
 
-SET(src_files
+set(src_files
 axis.cpp
 commands.cpp
 coord.cpp
@@ -45,7 +45,7 @@ toplevel.cpp
 var.cpp
 )
 
-SET(inc_files
+set(inc_files
 axis.hpp
 commands.hpp
 coord.hpp
@@ -80,15 +80,15 @@ var.hpp
 xax_lex.hpp
 )
 
-ADD_LIBRARY(libfrida SHARED
+add_library(libfrida SHARED
 ${src_files}
 ${BISON_xaxyacc_OUTPUTS}
 ${FLEX_xaxlex_OUTPUTS}
 )
 
-SET_TARGET_PROPERTIES(libfrida PROPERTIES OUTPUT_NAME frida)
+set_target_properties(libfrida PROPERTIES OUTPUT_NAME frida)
 
-TARGET_LINK_LIBRARIES(libfrida libreadplus libtrivia
+target_link_libraries(libfrida libreadplus libtrivia
 ${GSL_LIBRARIES}
 ${FFTW_LIBRARIES}
 ${LIBKWW_LIBS}
@@ -98,4 +98,4 @@ ${LIBLMFIT_LIBS}
 ${READLINE_LIBRARIES}
 )
 
-INSTALL(TARGETS libfrida DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+install(TARGETS libfrida DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
diff --git a/pub/man/CMakeLists.txt b/pub/man/CMakeLists.txt
index bf72e433ec2332da93864943cc01b54f9eb3bea8..1779e36dfc303f47ccb104e21435c48d6fd81b29 100644
--- a/pub/man/CMakeLists.txt
+++ b/pub/man/CMakeLists.txt
@@ -1,24 +1,24 @@
-ADD_CUSTOM_TARGET(
+add_custom_target(
     man ALL
     DEPENDS frida.1
 )
 
-ADD_CUSTOM_COMMAND(
+add_custom_command(
     OUTPUT frida.1
     COMMAND pod2man -s 1 -c "frida manual" ${CMAKE_CURRENT_SOURCE_DIR}/frida.pod ${CMAKE_CURRENT_BINARY_DIR}/frida.1
     DEPENDS frida.pod
 )
 
-ADD_CUSTOM_TARGET(
+add_custom_target(
     html ALL
     DEPENDS frida.html
 )
 
 # TODO: Find some place to put the html documentation.
-ADD_CUSTOM_COMMAND(
+add_custom_command(
     OUTPUT frida.html
     COMMAND pod2html --title="Frida - Fast reliable interactive data analysis" --noindex ${CMAKE_CURRENT_SOURCE_DIR}/frida.pod > ${CMAKE_CURRENT_BINARY_DIR}/frida.html
     DEPENDS frida.pod
 )
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/frida.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
\ No newline at end of file
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/frida.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
\ No newline at end of file
diff --git a/pub/readplus/CMakeLists.txt b/pub/readplus/CMakeLists.txt
index fe0edab17e02e3d27dcdef5327723f65991f9989..937ed1300ce3adf9ed02445391f5d4c85e4da3da 100644
--- a/pub/readplus/CMakeLists.txt
+++ b/pub/readplus/CMakeLists.txt
@@ -1,26 +1,26 @@
 # frida: readplus/CMakeLists.txt
 
-INCLUDE_DIRECTORIES(${Frida_SOURCE_DIR}/readplus ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${Frida_SOURCE_DIR}/readplus ${CMAKE_CURRENT_BINARY_DIR})
 
-SET(src_files
+set(src_files
 ask.cpp
 macro.cpp
 readln.cpp
 )
 
-SET(inc_files
+set(inc_files
 ask.hpp
 macro.hpp
 readln.hpp
 )
 
-ADD_LIBRARY(libreadplus SHARED
+add_library(libreadplus SHARED
 ${src_files}
 )
 
-SET_TARGET_PROPERTIES(libreadplus PROPERTIES OUTPUT_NAME readplus)
+set_target_properties(libreadplus PROPERTIES OUTPUT_NAME readplus)
 
-TARGET_LINK_LIBRARIES(libreadplus
+target_link_libraries(libreadplus
 )
 
-INSTALL(TARGETS libreadplus DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+install(TARGETS libreadplus DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
diff --git a/pub/share/CMakeLists.txt b/pub/share/CMakeLists.txt
index 496c0e2160f9c83f6df170437b1e1c6634995b25..6530debb965f05eafae0562a2f2c9627c429ae89 100644
--- a/pub/share/CMakeLists.txt
+++ b/pub/share/CMakeLists.txt
@@ -1,4 +1,4 @@
-CONFIGURE_FILE(frida.ini.in frida.ini)
-SET(share_files ${CMAKE_CURRENT_BINARY_DIR}/frida.ini g3.ps wups11a.ps gnuplot-default-symbols.eps)
-INSTALL(FILES ${share_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/frida)
+configure_file(frida.ini.in frida.ini)
+set(share_files ${CMAKE_CURRENT_BINARY_DIR}/frida.ini g3.ps wups11a.ps gnuplot-default-symbols.eps)
+install(FILES ${share_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/frida)
 
diff --git a/pub/src/CMakeLists.txt b/pub/src/CMakeLists.txt
index 4d679c65a615eaf95851a1937edd8f1a4d374d1c..6b7ab0541a4a039c513e84cfda298cde7db0e0bf 100644
--- a/pub/src/CMakeLists.txt
+++ b/pub/src/CMakeLists.txt
@@ -2,12 +2,12 @@
 
 CONFIGURE_FILE ("config_src.hpp.in" "${CMAKE_CURRENT_BINARY_DIR}/config_src.hpp")
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${Frida_SOURCE_DIR}/lib)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${Frida_SOURCE_DIR}/lib)
 
-SET(src_files frida2.cpp)
+set(src_files frida2.cpp)
 
-ADD_EXECUTABLE(frida frida2.cpp)
+add_executable(frida frida2.cpp)
 
-TARGET_LINK_LIBRARIES(frida libfrida)
+target_link_libraries(frida libfrida)
 
-INSTALL(TARGETS frida DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+install(TARGETS frida DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
diff --git a/pub/trivia/CMakeLists.txt b/pub/trivia/CMakeLists.txt
index 16b191feabea22381f5f5a98e785278593d8d98e..24db8b2c7bc1414176b614a86ee48989ae2a3224 100644
--- a/pub/trivia/CMakeLists.txt
+++ b/pub/trivia/CMakeLists.txt
@@ -1,8 +1,8 @@
 # frida: trivia/CMakeLists.txt
 
-INCLUDE_DIRECTORIES(${Frida_SOURCE_DIR}/trivia ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${Frida_SOURCE_DIR}/trivia ${CMAKE_CURRENT_BINARY_DIR})
 
-SET(src_files
+set(src_files
 file_ops.cpp
 integrate.cpp
 math.cpp
@@ -13,7 +13,7 @@ vector_ops.cpp
 yaml_out.cpp
 )
 
-SET(inc_files
+set(inc_files
 file_ops.hpp
 integrate.hpp
 math.hpp
@@ -24,13 +24,13 @@ vector_ops.hpp
 yaml_out.hpp
 )
 
-ADD_LIBRARY(libtrivia SHARED
+add_library(libtrivia SHARED
 ${src_files}
 )
 
-SET_TARGET_PROPERTIES(libtrivia PROPERTIES OUTPUT_NAME trivia)
+set_target_properties(libtrivia PROPERTIES OUTPUT_NAME trivia)
 
-TARGET_LINK_LIBRARIES(libtrivia
+target_link_libraries(libtrivia
 )
 
-INSTALL(TARGETS libtrivia DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
\ No newline at end of file
+install(TARGETS libtrivia DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
\ No newline at end of file