Convert CMake commands into lower-case

commands lists from help-command-list

Signed-off-by: JoonWoo Kim <jw1772.kim@samsung.com>

10 files changed, 258 insertions, 258 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38818db..d6ef8aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,109 +1,109 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.7.1)
-SET(CMAKE_SKIP_BUILD_RPATH true)
-PROJECT(aitt VERSION 0.0.1 LANGUAGES CXX C)
-SET_PROPERTY(GLOBAL PROPERTY GLOBAL_DEPENDS_DEBUG_MODE 0)
-SET(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-SET(CMAKE_CXX_STANDARD 11)
-SET(CMAKE_CXX_STANDARD_REQUIRED ON)
-SET(CMAKE_CXX_EXTENSIONS OFF)
-
-OPTION(VERSIONING "Specify Library Verion" ON)
-
-INCLUDE(GNUInstallDirs)
-INCLUDE(FindPkgConfig)
-
-IF(PLATFORM STREQUAL "android")
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fdiagnostics-color")
-	ADD_DEFINITIONS(-DANDROID)
-	ADD_DEFINITIONS(-DPLATFORM=${PLATFORM})
-	INCLUDE(${PROJECT_ROOT_DIR}/cmake/aitt_android_flatbuffers.cmake)
-	INCLUDE(${PROJECT_ROOT_DIR}/cmake/aitt_android_mosquitto.cmake)
-	SET(AITT_NEEDS_LIBRARIES ${MOSQUITTO_LIBRARY} ${FLATBUFFERS_LIBRARY} ${LOG_LIBRARIES})
-ELSE(PLATFORM STREQUAL "android")
-	IF(PLATFORM STREQUAL "tizen")
-		ADD_DEFINITIONS(-DTIZEN)
-		ADD_DEFINITIONS(-DPLATFORM=${PLATFORM})
-		SET(ADDITIONAL_OPT "-DTIZEN")
-		SET(ADDITION_PKG dlog)
-	ENDIF(PLATFORM STREQUAL "tizen")
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wno-psabi -fdiagnostics-color -fvisibility=hidden")
-	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
-	IF(USE_GLIB)
-		SET(ADDITION_PKG "${ADDITION_PKG} glib-2.0")
-	ENDIF(USE_GLIB)
-	PKG_CHECK_MODULES(AITT_NEEDS REQUIRED ${ADDITION_PKG} libmosquitto flatbuffers)
-	INCLUDE_DIRECTORIES(${AITT_NEEDS_INCLUDE_DIRS})
-	LINK_DIRECTORIES(${AITT_NEEDS_LIBRARY_DIRS})
-ENDIF(PLATFORM STREQUAL "android")
-
-FIND_PACKAGE(Threads REQUIRED)
-
-IF(LOG_STDOUT)
-	ADD_DEFINITIONS(-DLOG_STDOUT)
-ENDIF(LOG_STDOUT)
-
-ADD_DEFINITIONS(-DLOG_TAG="AITT")
-
-IF(COVERAGE_TEST)
-	ADD_COMPILE_OPTIONS(--coverage)
-	ADD_LINK_OPTIONS(--coverage -Wl,--dynamic-list-data)
-ENDIF(COVERAGE_TEST)
-
-SET(AITT_COMMON ${PROJECT_NAME}-common)
-
-INCLUDE_DIRECTORIES(include common)
-
-AUX_SOURCE_DIRECTORY(src AITT_SRC)
-
-SET(AITT_INTERNAL_SRC src/ModuleManager.cc src/NullTransport.cc src/MosquittoMQ.cc)
-ADD_LIBRARY(INTERNAL_OBJ OBJECT ${AITT_INTERNAL_SRC})
+cmake_minimum_required(VERSION 3.7.1)
+set(CMAKE_SKIP_BUILD_RPATH true)
+project(aitt VERSION 0.0.1 LANGUAGES CXX C)
+set_property(GLOBAL PROPERTY GLOBAL_DEPENDS_DEBUG_MODE 0)
+set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+option(VERSIONING "Specify Library Verion" ON)
+
+include(GNUInstallDirs)
+include(FindPkgConfig)
+
+if(PLATFORM STREQUAL "android")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fdiagnostics-color")
+	add_definitions(-DANDROID)
+	add_definitions(-DPLATFORM=${PLATFORM})
+	include(${PROJECT_ROOT_DIR}/cmake/aitt_android_flatbuffers.cmake)
+	include(${PROJECT_ROOT_DIR}/cmake/aitt_android_mosquitto.cmake)
+	set(AITT_NEEDS_LIBRARIES ${MOSQUITTO_LIBRARY} ${FLATBUFFERS_LIBRARY} ${LOG_LIBRARIES})
+else(PLATFORM STREQUAL "android")
+	if(PLATFORM STREQUAL "tizen")
+		add_definitions(-DTIZEN)
+		add_definitions(-DPLATFORM=${PLATFORM})
+		set(ADDITIONAL_OPT "-DTIZEN")
+		set(ADDITION_PKG dlog)
+	endif(PLATFORM STREQUAL "tizen")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wno-psabi -fdiagnostics-color -fvisibility=hidden")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
+	if(USE_GLIB)
+		set(ADDITION_PKG "${ADDITION_PKG} glib-2.0")
+	endif(USE_GLIB)
+	pkg_check_modules(AITT_NEEDS REQUIRED ${ADDITION_PKG} libmosquitto flatbuffers)
+	include_directories(${AITT_NEEDS_INCLUDE_DIRS})
+	link_directories(${AITT_NEEDS_LIBRARY_DIRS})
+endif(PLATFORM STREQUAL "android")
+
+find_package(Threads REQUIRED)
+
+if(LOG_STDOUT)
+	add_definitions(-DLOG_STDOUT)
+endif(LOG_STDOUT)
+
+add_definitions(-DLOG_TAG="AITT")
+
+if(COVERAGE_TEST)
+	add_compile_options(--coverage)
+	add_link_options(--coverage -Wl,--dynamic-list-data)
+endif(COVERAGE_TEST)
+
+set(AITT_COMMON ${PROJECT_NAME}-common)
+
+include_directories(include common)
+
+aux_source_directory(src AITT_SRC)
+
+set(AITT_INTERNAL_SRC src/ModuleManager.cc src/NullTransport.cc src/MosquittoMQ.cc)
+add_library(INTERNAL_OBJ OBJECT ${AITT_INTERNAL_SRC})
 list(REMOVE_ITEM AITT_SRC ${AITT_INTERNAL_SRC})
 
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${AITT_SRC} $<TARGET_OBJECTS:INTERNAL_OBJ>)
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} Threads::Threads ${CMAKE_DL_LIBS} ${AITT_COMMON})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${AITT_NEEDS_LIBRARIES})
+add_library(${PROJECT_NAME} SHARED ${AITT_SRC} $<TARGET_OBJECTS:INTERNAL_OBJ>)
+target_link_libraries(${PROJECT_NAME} Threads::Threads ${CMAKE_DL_LIBS} ${AITT_COMMON})
+target_link_libraries(${PROJECT_NAME} ${AITT_NEEDS_LIBRARIES})
 
-TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PUBLIC ${AITT_NEEDS_CFLAGS_OTHER})
-IF(VERSIONING)
-	SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
+target_compile_options(${PROJECT_NAME} PUBLIC ${AITT_NEEDS_CFLAGS_OTHER})
+if(VERSIONING)
+	set_target_properties(${PROJECT_NAME} PROPERTIES
 		VERSION ${PROJECT_VERSION}
 		SOVERSION ${PROJECT_VERSION_MAJOR}
 		)
-ENDIF(VERSIONING)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-FILE(GLOB HEADERS include/*.h)
-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
-
-CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_CMAKE_CLEAN_FILES ${PROJECT_NAME}.pc)
-
-IF(BUILD_TESTING)
-	ENABLE_TESTING() # NOTE: Must comes first than unittest subdirectories
-	SET(AITT_TEST_BINDIR ${CMAKE_INSTALL_BINDIR})
-	ADD_SUBDIRECTORY(tests)
-	ADD_SUBDIRECTORY(tools)
-ENDIF(BUILD_TESTING)
-
-OPTION(WITH_TCP "Build TCP module?" ON)
-OPTION(WITH_MBEDTLS "Use Mbed TLS, not OpenSSL" OFF)
-OPTION(WITH_WEBRTC "Build WebRtc module?" OFF)
-OPTION(WITH_RTSP "Build RTSP module?" OFF)
-
-IF(WITH_TCP)
-	ADD_SUBDIRECTORY(modules/tcp)
-ENDIF()
-
-IF(PLATFORM STREQUAL "tizen")
-	IF(WITH_WEBRTC)
-		ADD_DEFINITIONS(-DWITH_WEBRTC)
-		ADD_SUBDIRECTORY(modules/webrtc)
-	ENDIF()
-	IF(WITH_RTSP)
-		ADD_DEFINITIONS(-DWITH_RTSP)
-		ADD_SUBDIRECTORY(modules/rtsp)
-	ENDIF()
-ENDIF(PLATFORM STREQUAL "tizen")
-
-ADD_SUBDIRECTORY(common)
+endif(VERSIONING)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+file(GLOB HEADERS include/*.h)
+install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
+
+configure_file(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+set_directory_properties(PROPERTIES ADDITIONAL_CMAKE_CLEAN_FILES ${PROJECT_NAME}.pc)
+
+if(BUILD_TESTING)
+	enable_testing() # NOTE: Must comes first than unittest subdirectories
+	set(AITT_TEST_BINDIR ${CMAKE_INSTALL_BINDIR})
+	add_subdirectory(tests)
+	add_subdirectory(tools)
+endif(BUILD_TESTING)
+
+option(WITH_TCP "Build TCP module?" ON)
+option(WITH_MBEDTLS "Use Mbed TLS, not OpenSSL" OFF)
+option(WITH_WEBRTC "Build WebRtc module?" OFF)
+option(WITH_RTSP "Build RTSP module?" OFF)
+
+if(WITH_TCP)
+	add_subdirectory(modules/tcp)
+endif()
+
+if(PLATFORM STREQUAL "tizen")
+	if(WITH_WEBRTC)
+		add_definitions(-DWITH_WEBRTC)
+		add_subdirectory(modules/webrtc)
+	endif()
+	if(WITH_RTSP)
+		add_definitions(-DWITH_RTSP)
+		add_subdirectory(modules/rtsp)
+	endif()
+endif(PLATFORM STREQUAL "tizen")
+
+add_subdirectory(common)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 6ebdc73..6bc47f4 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,23 +1,23 @@
-FILE(GLOB COMMON_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.cc)
+file(GLOB COMMON_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.cc)
 
-IF(USE_GLIB)
-	ADD_DEFINITIONS(-DUSE_GLIB)
-	LIST(REMOVE_ITEM COMMON_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/PosixMainLoop.cc)
-ELSE(USE_GLIB)
-	LIST(REMOVE_ITEM COMMON_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/GlibMainLoop.cc)
+if(USE_GLIB)
+	add_definitions(-DUSE_GLIB)
+	list(REMOVE_ITEM COMMON_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/PosixMainLoop.cc)
+else(USE_GLIB)
+	list(REMOVE_ITEM COMMON_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/GlibMainLoop.cc)
 
-	IF(NOT PLATFORM STREQUAL "android")
-		SET(ADDITION_LIB rt)
-	ENDIF()
-ENDIF(USE_GLIB)
+	if(NOT PLATFORM STREQUAL "android")
+		set(ADDITION_LIB rt)
+	endif()
+endif(USE_GLIB)
 
-ADD_LIBRARY(${AITT_COMMON} SHARED ${COMMON_SRCS})
-TARGET_LINK_LIBRARIES(${AITT_COMMON} ${AITT_NEEDS_LIBRARIES} ${ADDITION_LIB} Threads::Threads)
-TARGET_COMPILE_OPTIONS(${AITT_COMMON} PRIVATE ${AITT_NEEDS_CFLAGS_OTHER} "-fvisibility=default")
-IF(VERSIONING)
-	SET_TARGET_PROPERTIES(${AITT_COMMON} PROPERTIES
+add_library(${AITT_COMMON} SHARED ${COMMON_SRCS})
+target_link_libraries(${AITT_COMMON} ${AITT_NEEDS_LIBRARIES} ${ADDITION_LIB} Threads::Threads)
+target_compile_options(${AITT_COMMON} PRIVATE ${AITT_NEEDS_CFLAGS_OTHER} "-fvisibility=default")
+if(VERSIONING)
+	set_target_properties(${AITT_COMMON} PROPERTIES
 		VERSION ${PROJECT_VERSION}
 		SOVERSION ${PROJECT_VERSION_MAJOR}
 		)
-ENDIF(VERSIONING)
-INSTALL(TARGETS ${AITT_COMMON} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif(VERSIONING)
+install(TARGETS ${AITT_COMMON} DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/modules/rtsp/CMakeLists.txt b/modules/rtsp/CMakeLists.txt
index 891034a..8e7e634 100644
--- a/modules/rtsp/CMakeLists.txt
+++ b/modules/rtsp/CMakeLists.txt
@@ -1,21 +1,21 @@
-IF(PLATFORM STREQUAL "tizen")
-    SET(AITT_RTSP aitt-stream-rtsp)
+if(PLATFORM STREQUAL "tizen")
+    set(AITT_RTSP aitt-stream-rtsp)
 
-    INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-    PKG_CHECK_MODULES(AITT_RTSP_NEEDS REQUIRED
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+    pkg_check_modules(AITT_RTSP_NEEDS REQUIRED
         capi-media-player
         capi-media-image-util
     )
-    INCLUDE_DIRECTORIES(${AITT_RTSP_NEEDS_INCLUDE_DIRS})
-    LINK_DIRECTORIES(${AITT_RTSP_NEEDS_LIBRARY_DIRS})
+    include_directories(${AITT_RTSP_NEEDS_INCLUDE_DIRS})
+    link_directories(${AITT_RTSP_NEEDS_LIBRARY_DIRS})
 
-    FILE(GLOB AITT_RTSP_SRC *.cc)
+    file(GLOB AITT_RTSP_SRC *.cc)
     list(REMOVE_ITEM AITT_RTSP_SRC ${CMAKE_CURRENT_SOURCE_DIR}/Module.cc)
-    ADD_LIBRARY(RTSP_OBJ OBJECT ${AITT_RTSP_SRC})
-    ADD_LIBRARY(${AITT_RTSP} SHARED $<TARGET_OBJECTS:RTSP_OBJ> Module.cc ../stream_entry.cc)
-    TARGET_LINK_LIBRARIES(${AITT_RTSP} ${AITT_RTSP_NEEDS_LIBRARIES} ${AITT_COMMON})
-    TARGET_COMPILE_OPTIONS(${AITT_RTSP} PUBLIC ${AITT_RTSP_NEEDS_CFLAGS_OTHER})
-    INSTALL(TARGETS ${AITT_RTSP} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-ELSE(PLATFORM STREQUAL "tizen")
-    MESSAGE ( WARNING "Required to write CMakefile for each Platform" )
-ENDIF(PLATFORM STREQUAL "tizen")
+    add_library(RTSP_OBJ OBJECT ${AITT_RTSP_SRC})
+    add_library(${AITT_RTSP} SHARED $<TARGET_OBJECTS:RTSP_OBJ> Module.cc ../stream_entry.cc)
+    target_link_libraries(${AITT_RTSP} ${AITT_RTSP_NEEDS_LIBRARIES} ${AITT_COMMON})
+    target_compile_options(${AITT_RTSP} PUBLIC ${AITT_RTSP_NEEDS_CFLAGS_OTHER})
+    install(TARGETS ${AITT_RTSP} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+else(PLATFORM STREQUAL "tizen")
+    message ( WARNING "Required to write CMakefile for each Platform" )
+endif(PLATFORM STREQUAL "tizen")
diff --git a/modules/tcp/CMakeLists.txt b/modules/tcp/CMakeLists.txt
index 899a570..57e399e 100644
--- a/modules/tcp/CMakeLists.txt
+++ b/modules/tcp/CMakeLists.txt
@@ -1,43 +1,43 @@
-SET(AITT_TCP aitt-transport-tcp)
-SET(AITT_SECURE_TCP aitt-transport-tcp-secure)
+set(AITT_TCP aitt-transport-tcp)
+set(AITT_SECURE_TCP aitt-transport-tcp-secure)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-IF(WITH_MBEDTLS)
-    ADD_DEFINITIONS(-DWITH_MBEDTLS)
-    SET(ENCRYPTOR_SRC AESEncryptorMbedTLS.cc)
-ELSE(WITH_MBEDTLS)
-    SET(ENCRYPTOR_SRC AESEncryptorOpenSSL.cc)
-ENDIF(WITH_MBEDTLS)
+if(WITH_MBEDTLS)
+    add_definitions(-DWITH_MBEDTLS)
+    set(ENCRYPTOR_SRC AESEncryptorMbedTLS.cc)
+else(WITH_MBEDTLS)
+    set(ENCRYPTOR_SRC AESEncryptorOpenSSL.cc)
+endif(WITH_MBEDTLS)
 
-ADD_LIBRARY(TCP_OBJ STATIC TCP.cc TCPServer.cc AESEncryptor.cc ${ENCRYPTOR_SRC})
+add_library(TCP_OBJ STATIC TCP.cc TCPServer.cc AESEncryptor.cc ${ENCRYPTOR_SRC})
 
-IF(PLATFORM STREQUAL "android")
-    FIND_PACKAGE(openssl REQUIRED CONFIG)
-    TARGET_LINK_LIBRARIES(TCP_OBJ openssl::crypto)
-ELSE(PLATFORM STREQUAL "android")
-    IF(PLATFORM STREQUAL "tizen")
-        SET(OPENSSL openssl1.1)
-    ELSE(PLATFORM STREQUAL "tizen")
-        SET(OPENSSL openssl)
-        IF(WITH_MBEDTLS)
-            TARGET_LINK_LIBRARIES(TCP_OBJ mbedcrypto)
-            UNSET(OPENSSL)
-        ENDIF(WITH_MBEDTLS)
-    ENDIF(PLATFORM STREQUAL "tizen")
-    PKG_CHECK_MODULES(AITT_TCP_NEEDS REQUIRED ${OPENSSL})
-    INCLUDE_DIRECTORIES(${AITT_TCP_NEEDS_INCLUDE_DIRS})
-    LINK_DIRECTORIES(${AITT_TCP_NEEDS_LIBRARY_DIRS})
-ENDIF(PLATFORM STREQUAL "android")
+if(PLATFORM STREQUAL "android")
+    find_package(openssl REQUIRED CONFIG)
+    target_link_libraries(TCP_OBJ openssl::crypto)
+else(PLATFORM STREQUAL "android")
+    if(PLATFORM STREQUAL "tizen")
+        set(OPENSSL openssl1.1)
+    else(PLATFORM STREQUAL "tizen")
+        set(OPENSSL openssl)
+        if(WITH_MBEDTLS)
+            target_link_libraries(TCP_OBJ mbedcrypto)
+            unset(OPENSSL)
+        endif(WITH_MBEDTLS)
+    endif(PLATFORM STREQUAL "tizen")
+    pkg_check_modules(AITT_TCP_NEEDS REQUIRED ${OPENSSL})
+    include_directories(${AITT_TCP_NEEDS_INCLUDE_DIRS})
+    link_directories(${AITT_TCP_NEEDS_LIBRARY_DIRS})
+endif(PLATFORM STREQUAL "android")
 
-ADD_LIBRARY(${AITT_TCP} SHARED ../transport_entry.cc Module.cc)
-TARGET_LINK_LIBRARIES(${AITT_TCP} Threads::Threads TCP_OBJ ${AITT_COMMON} ${AITT_TCP_NEEDS_LIBRARIES})
+add_library(${AITT_TCP} SHARED ../transport_entry.cc Module.cc)
+target_link_libraries(${AITT_TCP} Threads::Threads TCP_OBJ ${AITT_COMMON} ${AITT_TCP_NEEDS_LIBRARIES})
 
-INSTALL(TARGETS ${AITT_TCP} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS ${AITT_TCP} DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
-IF(BUILD_TESTING)
-    ADD_SUBDIRECTORY(tests)
-    IF(USE_GLIB)
-        ADD_SUBDIRECTORY(samples)
-    ENDIF(USE_GLIB)
-ENDIF(BUILD_TESTING)
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+    if(USE_GLIB)
+        add_subdirectory(samples)
+    endif(USE_GLIB)
+endif(BUILD_TESTING)
diff --git a/modules/tcp/samples/CMakeLists.txt b/modules/tcp/samples/CMakeLists.txt
index 7362a9e..6264f3b 100644
--- a/modules/tcp/samples/CMakeLists.txt
+++ b/modules/tcp/samples/CMakeLists.txt
@@ -1,7 +1,7 @@
-PKG_CHECK_MODULES(SAMPLE_NEEDS REQUIRED ${ADDITION_PKG})
-INCLUDE_DIRECTORIES(${SAMPLE_NEEDS_INCLUDE_DIRS})
-LINK_DIRECTORIES(${SAMPLE_NEEDS_LIBRARY_DIRS})
+pkg_check_modules(SAMPLE_NEEDS REQUIRED ${ADDITION_PKG})
+include_directories(${SAMPLE_NEEDS_INCLUDE_DIRS})
+link_directories(${SAMPLE_NEEDS_LIBRARY_DIRS})
 
-ADD_EXECUTABLE("aitt_tcp_test" tcp_test.cc)
-TARGET_LINK_LIBRARIES("aitt_tcp_test" TCP_OBJ ${SAMPLE_NEEDS_LIBRARIES} ${AITT_TCP_NEEDS_LIBRARIES})
-INSTALL(TARGETS "aitt_tcp_test" DESTINATION ${AITT_TEST_BINDIR})
+add_executable("aitt_tcp_test" tcp_test.cc)
+target_link_libraries("aitt_tcp_test" TCP_OBJ ${SAMPLE_NEEDS_LIBRARIES} ${AITT_TCP_NEEDS_LIBRARIES})
+install(TARGETS "aitt_tcp_test" DESTINATION ${AITT_TEST_BINDIR})
diff --git a/modules/tcp/tests/CMakeLists.txt b/modules/tcp/tests/CMakeLists.txt
index 04f9cb4..7950dcd 100644
--- a/modules/tcp/tests/CMakeLists.txt
+++ b/modules/tcp/tests/CMakeLists.txt
@@ -1,20 +1,20 @@
-SET(AITT_TCP_UT ${PROJECT_NAME}_tcp_ut)
+set(AITT_TCP_UT ${PROJECT_NAME}_tcp_ut)
 
-SET(AITT_TCP_UT_SRC TCP_test.cc TCPServer_test.cc AESEncryptor_test.cc)
-IF(WITH_MBEDTLS)
-    SET(AITT_TCP_UT_SRC ${AITT_TCP_UT_SRC} ../AESEncryptorOpenSSL.cc AES_Compatibility_test.cc)
-    SET(ADDITION_PKG ${ADDITION_PKG} openssl)
-ENDIF(WITH_MBEDTLS)
+set(AITT_TCP_UT_SRC TCP_test.cc TCPServer_test.cc AESEncryptor_test.cc)
+if(WITH_MBEDTLS)
+    set(AITT_TCP_UT_SRC ${AITT_TCP_UT_SRC} ../AESEncryptorOpenSSL.cc AES_Compatibility_test.cc)
+    set(ADDITION_PKG ${ADDITION_PKG} openssl)
+endif(WITH_MBEDTLS)
 
-PKG_CHECK_MODULES(UT_NEEDS REQUIRED gmock_main ${ADDITION_PKG})
-INCLUDE_DIRECTORIES(${UT_NEEDS_INCLUDE_DIRS})
-LINK_DIRECTORIES(${UT_NEEDS_LIBRARY_DIRS})
+pkg_check_modules(UT_NEEDS REQUIRED gmock_main ${ADDITION_PKG})
+include_directories(${UT_NEEDS_INCLUDE_DIRS})
+link_directories(${UT_NEEDS_LIBRARY_DIRS})
 
-ADD_EXECUTABLE(${AITT_TCP_UT} ${AITT_TCP_UT_SRC})
-TARGET_LINK_LIBRARIES(${AITT_TCP_UT} TCP_OBJ Threads::Threads ${UT_NEEDS_LIBRARIES} ${AITT_TCP_NEEDS_LIBRARIES})
-INSTALL(TARGETS ${AITT_TCP_UT} DESTINATION ${AITT_TEST_BINDIR})
+add_executable(${AITT_TCP_UT} ${AITT_TCP_UT_SRC})
+target_link_libraries(${AITT_TCP_UT} TCP_OBJ Threads::Threads ${UT_NEEDS_LIBRARIES} ${AITT_TCP_NEEDS_LIBRARIES})
+install(TARGETS ${AITT_TCP_UT} DESTINATION ${AITT_TEST_BINDIR})
 
-ADD_TEST(
+add_test(
     NAME
         ${AITT_TCP_UT}
     COMMAND
diff --git a/modules/webrtc/CMakeLists.txt b/modules/webrtc/CMakeLists.txt
index 9029d59..04fe831 100644
--- a/modules/webrtc/CMakeLists.txt
+++ b/modules/webrtc/CMakeLists.txt
@@ -1,17 +1,17 @@
-SET(AITT_WEBRTC aitt-stream-webrtc)
+set(AITT_WEBRTC aitt-stream-webrtc)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-PKG_CHECK_MODULES(AITT_WEBRTC_NEEDS REQUIRED
+pkg_check_modules(AITT_WEBRTC_NEEDS REQUIRED
     capi-media-camera
     capi-media-webrtc
     gstreamer-video-1.0
     json-glib-1.0
 )
-INCLUDE_DIRECTORIES(${AITT_WEBRTC_NEEDS_INCLUDE_DIRS})
-LINK_DIRECTORIES(${AITT_WEBRTC_NEEDS_LIBRARY_DIRS})
+include_directories(${AITT_WEBRTC_NEEDS_INCLUDE_DIRS})
+link_directories(${AITT_WEBRTC_NEEDS_LIBRARY_DIRS})
 
-ADD_LIBRARY(WEBRTC_OBJ OBJECT
+add_library(WEBRTC_OBJ OBJECT
     StreamManager.cc
     SrcStreamManager.cc
     SinkStreamManager.cc
@@ -20,12 +20,12 @@ ADD_LIBRARY(WEBRTC_OBJ OBJECT
     WebRtcStream.cc
     RequestServer.cc
 )
-ADD_LIBRARY(${AITT_WEBRTC} SHARED $<TARGET_OBJECTS:WEBRTC_OBJ> Module.cc ../stream_entry.cc )
-TARGET_LINK_LIBRARIES(${AITT_WEBRTC} ${AITT_WEBRTC_NEEDS_LIBRARIES} ${AITT_COMMON})
-TARGET_COMPILE_OPTIONS(${AITT_WEBRTC} PUBLIC ${AITT_WEBRTC_NEEDS_CFLAGS_OTHER})
+add_library(${AITT_WEBRTC} SHARED $<TARGET_OBJECTS:WEBRTC_OBJ> Module.cc ../stream_entry.cc )
+target_link_libraries(${AITT_WEBRTC} ${AITT_WEBRTC_NEEDS_LIBRARIES} ${AITT_COMMON})
+target_compile_options(${AITT_WEBRTC} PUBLIC ${AITT_WEBRTC_NEEDS_CFLAGS_OTHER})
 
-INSTALL(TARGETS ${AITT_WEBRTC} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS ${AITT_WEBRTC} DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
-IF(BUILD_TESTING)
-    ADD_SUBDIRECTORY(tests)
-ENDIF(BUILD_TESTING)
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+endif(BUILD_TESTING)
diff --git a/modules/webrtc/tests/CMakeLists.txt b/modules/webrtc/tests/CMakeLists.txt
index 419349e..a3b169a 100644
--- a/modules/webrtc/tests/CMakeLists.txt
+++ b/modules/webrtc/tests/CMakeLists.txt
@@ -1,18 +1,18 @@
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..)
-INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+include_directories(${CMAKE_BINARY_DIR}/src)
 
-PKG_CHECK_MODULES(UT_NEEDS REQUIRED gmock_main)
-INCLUDE_DIRECTORIES(${UT_NEEDS_INCLUDE_DIRS})
-LINK_DIRECTORIES(${UT_NEEDS_LIBRARY_DIRS})
+pkg_check_modules(UT_NEEDS REQUIRED gmock_main)
+include_directories(${UT_NEEDS_INCLUDE_DIRS})
+link_directories(${UT_NEEDS_LIBRARY_DIRS})
 
-SET(AITT_WEBRTC_UT ${PROJECT_NAME}_webrtc_ut)
-SET(AITT_WEBRTC_UT_SRC WEBRTC_test.cc ../Module.cc ${CMAKE_BINARY_DIR}/src/MosquittoMQ.cc)
+set(AITT_WEBRTC_UT ${PROJECT_NAME}_webrtc_ut)
+set(AITT_WEBRTC_UT_SRC WEBRTC_test.cc ../Module.cc ${CMAKE_BINARY_DIR}/src/MosquittoMQ.cc)
 
-ADD_EXECUTABLE(${AITT_WEBRTC_UT} ${AITT_WEBRTC_UT_SRC} $<TARGET_OBJECTS:WEBRTC_OBJ>)
-TARGET_LINK_LIBRARIES(${AITT_WEBRTC_UT} ${UT_NEEDS_LIBRARIES} ${AITT_WEBRTC_NEEDS_LIBRARIES} ${AITT_COMMON})
-INSTALL(TARGETS ${AITT_WEBRTC_UT} DESTINATION ${AITT_TEST_BINDIR})
+add_executable(${AITT_WEBRTC_UT} ${AITT_WEBRTC_UT_SRC} $<TARGET_OBJECTS:WEBRTC_OBJ>)
+target_link_libraries(${AITT_WEBRTC_UT} ${UT_NEEDS_LIBRARIES} ${AITT_WEBRTC_NEEDS_LIBRARIES} ${AITT_COMMON})
+install(TARGETS ${AITT_WEBRTC_UT} DESTINATION ${AITT_TEST_BINDIR})
 
-ADD_TEST(
+add_test(
     NAME
         ${AITT_WEBRTC_UT}
     COMMAND
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2171eb1..a27f8f8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,20 +1,20 @@
-SET(AITT_UT ${PROJECT_NAME}_ut)
+set(AITT_UT ${PROJECT_NAME}_ut)
 
-ADD_DEFINITIONS(-DLOG_STDOUT)
+add_definitions(-DLOG_STDOUT)
 
-PKG_CHECK_MODULES(UT_NEEDS REQUIRED gmock_main)
-INCLUDE_DIRECTORIES(${UT_NEEDS_INCLUDE_DIRS} ../src)
-LINK_DIRECTORIES(${UT_NEEDS_LIBRARY_DIRS})
+pkg_check_modules(UT_NEEDS REQUIRED gmock_main)
+include_directories(${UT_NEEDS_INCLUDE_DIRS} ../src)
+link_directories(${UT_NEEDS_LIBRARY_DIRS})
 
 ###########################################################################
-SET(AITT_UT_SRC AITT_test.cc RequestResponse_test.cc MainLoopHandler_test.cc aitt_c_test.cc
+set(AITT_UT_SRC AITT_test.cc RequestResponse_test.cc MainLoopHandler_test.cc aitt_c_test.cc
     AITT_TCP_test.cc)
-ADD_EXECUTABLE(${AITT_UT} ${AITT_UT_SRC})
-TARGET_LINK_LIBRARIES(${AITT_UT} Threads::Threads ${UT_NEEDS_LIBRARIES} ${PROJECT_NAME})
+add_executable(${AITT_UT} ${AITT_UT_SRC})
+target_link_libraries(${AITT_UT} Threads::Threads ${UT_NEEDS_LIBRARIES} ${PROJECT_NAME})
 
-INSTALL(TARGETS ${AITT_UT} DESTINATION ${AITT_TEST_BINDIR})
+install(TARGETS ${AITT_UT} DESTINATION ${AITT_TEST_BINDIR})
 
-ADD_TEST(
+add_test(
     NAME
         ${AITT_UT}
     COMMAND
@@ -25,17 +25,17 @@ ADD_TEST(
 
 ###########################################################################
 
-IF(WITH_WEBRTC)
-ADD_DEFINITIONS(-DWITH_WEBRTC)
-ENDIF()
-SET(AITT_STREAM_UT ${PROJECT_NAME}_stream_ut)
-SET(AITT_STREAM_UT_SRC AittStream_test.cc)
-ADD_EXECUTABLE(${AITT_STREAM_UT} ${AITT_STREAM_UT_SRC})
-TARGET_LINK_LIBRARIES(${AITT_STREAM_UT} Threads::Threads ${UT_NEEDS_LIBRARIES} ${PROJECT_NAME})
+if(WITH_WEBRTC)
+add_definitions(-DWITH_WEBRTC)
+endif()
+set(AITT_STREAM_UT ${PROJECT_NAME}_stream_ut)
+set(AITT_STREAM_UT_SRC AittStream_test.cc)
+add_executable(${AITT_STREAM_UT} ${AITT_STREAM_UT_SRC})
+target_link_libraries(${AITT_STREAM_UT} Threads::Threads ${UT_NEEDS_LIBRARIES} ${PROJECT_NAME})
 
-INSTALL(TARGETS ${AITT_STREAM_UT} DESTINATION ${AITT_TEST_BINDIR})
+install(TARGETS ${AITT_STREAM_UT} DESTINATION ${AITT_TEST_BINDIR})
 
-ADD_TEST(
+add_test(
     NAME
         ${AITT_STREAM_UT}
     COMMAND
@@ -44,26 +44,26 @@ ADD_TEST(
         ${CMAKE_CURRENT_BINARY_DIR}/${AITT_STREAM_UT} --gtest_filter=*_Anytime
 )
 ###########################################################################
-FILE(GLOB AITT_MANUAL_SRC *_manualtest.cc)
-ADD_EXECUTABLE(${AITT_UT}_manual ${AITT_MANUAL_SRC})
-TARGET_LINK_LIBRARIES(${AITT_UT}_manual Threads::Threads ${UT_NEEDS_LIBRARIES} ${PROJECT_NAME})
+file(GLOB AITT_MANUAL_SRC *_manualtest.cc)
+add_executable(${AITT_UT}_manual ${AITT_MANUAL_SRC})
+target_link_libraries(${AITT_UT}_manual Threads::Threads ${UT_NEEDS_LIBRARIES} ${PROJECT_NAME})
 
-INSTALL(TARGETS ${AITT_UT}_manual DESTINATION ${AITT_TEST_BINDIR})
+install(TARGETS ${AITT_UT}_manual DESTINATION ${AITT_TEST_BINDIR})
 
 ###########################################################################
-IF(${UT_NEEDS_VERSION} GREATER 1.7)
-    SET(AITT_UT_MQ ${PROJECT_NAME}_ut_mq)
-    ADD_EXECUTABLE(${AITT_UT_MQ} MosquittoMQ_mocktest.cc MosquittoMock.cc $<TARGET_OBJECTS:INTERNAL_OBJ>)
-    TARGET_LINK_LIBRARIES(${AITT_UT_MQ} ${UT_NEEDS_LIBRARIES} Threads::Threads ${CMAKE_DL_LIBS} ${AITT_COMMON})
-    IF(${UT_NEEDS_VERSION} GREATER 1.10)
-        TARGET_INCLUDE_DIRECTORIES(${AITT_UT_MQ} PRIVATE ../external/C-Mock/v0.4.0)
-    ELSE()
-        TARGET_INCLUDE_DIRECTORIES(${AITT_UT_MQ} PRIVATE ../external/C-Mock/v0.3.1)
-    ENDIF()
-    TARGET_LINK_LIBRARIES(${AITT_UT_MQ} ${UT_NEEDS_LIBRARIES})
-    INSTALL(TARGETS ${AITT_UT_MQ} DESTINATION ${AITT_TEST_BINDIR})
+if(${UT_NEEDS_VERSION} GREATER 1.7)
+    set(AITT_UT_MQ ${PROJECT_NAME}_ut_mq)
+    add_executable(${AITT_UT_MQ} MosquittoMQ_mocktest.cc MosquittoMock.cc $<TARGET_OBJECTS:INTERNAL_OBJ>)
+    target_link_libraries(${AITT_UT_MQ} ${UT_NEEDS_LIBRARIES} Threads::Threads ${CMAKE_DL_LIBS} ${AITT_COMMON})
+    if(${UT_NEEDS_VERSION} GREATER 1.10)
+        target_include_directories(${AITT_UT_MQ} PRIVATE ../external/C-Mock/v0.4.0)
+    else()
+        target_include_directories(${AITT_UT_MQ} PRIVATE ../external/C-Mock/v0.3.1)
+    endif()
+    target_link_libraries(${AITT_UT_MQ} ${UT_NEEDS_LIBRARIES})
+    install(TARGETS ${AITT_UT_MQ} DESTINATION ${AITT_TEST_BINDIR})
 
-    ADD_TEST(
+    add_test(
         NAME
             ${AITT_UT_MQ}
         COMMAND
@@ -71,14 +71,14 @@ IF(${UT_NEEDS_VERSION} GREATER 1.7)
             LD_LIBRARY_PATH=../common/:$ENV{LD_LIBRARY_PATH}
             ${CMAKE_CURRENT_BINARY_DIR}/${AITT_UT_MQ} --gtest_filter=*_Anytime
     )
-ENDIF(${UT_NEEDS_VERSION} GREATER 1.7)
+endif(${UT_NEEDS_VERSION} GREATER 1.7)
 ###########################################################################
-ADD_EXECUTABLE(${AITT_UT}_local ModuleLoader_test.cc MosquittoMQ_test.cc $<TARGET_OBJECTS:INTERNAL_OBJ>)
-TARGET_LINK_LIBRARIES(${AITT_UT}_local ${UT_NEEDS_LIBRARIES} ${AITT_NEEDS_LIBRARIES} ${CMAKE_DL_LIBS} ${AITT_COMMON})
+add_executable(${AITT_UT}_local ModuleLoader_test.cc MosquittoMQ_test.cc $<TARGET_OBJECTS:INTERNAL_OBJ>)
+target_link_libraries(${AITT_UT}_local ${UT_NEEDS_LIBRARIES} ${AITT_NEEDS_LIBRARIES} ${CMAKE_DL_LIBS} ${AITT_COMMON})
 
-INSTALL(TARGETS ${AITT_UT}_local DESTINATION ${AITT_TEST_BINDIR})
+install(TARGETS ${AITT_UT}_local DESTINATION ${AITT_TEST_BINDIR})
 
-ADD_TEST(
+add_test(
     NAME
         ${AITT_UT}_local
     COMMAND
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index d8fe56d..f8d1fce 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,7 +1,7 @@
-SET(AITT_DISCOVERY_TOOL ${PROJECT_NAME}_discovery_viewer)
+set(AITT_DISCOVERY_TOOL ${PROJECT_NAME}_discovery_viewer)
 
 ###########################################################################
-ADD_EXECUTABLE(${AITT_DISCOVERY_TOOL} discovery_viewer.cc FlexbufPrinter.cc)
-TARGET_LINK_LIBRARIES(${AITT_DISCOVERY_TOOL} ${AITT_NEEDS_LIBRARIES})
+add_executable(${AITT_DISCOVERY_TOOL} discovery_viewer.cc FlexbufPrinter.cc)
+target_link_libraries(${AITT_DISCOVERY_TOOL} ${AITT_NEEDS_LIBRARIES})
 
-INSTALL(TARGETS ${AITT_DISCOVERY_TOOL} DESTINATION ${AITT_TEST_BINDIR})
+install(TARGETS ${AITT_DISCOVERY_TOOL} DESTINATION ${AITT_TEST_BINDIR})