3 files changed, 55 insertions, 55 deletions
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