[ITC/UTC][CMakeLists.txt][Non-ACR][Fix bugs and code cleanup]

- Remove duplicated defines
- Add missing defines
- Check if varaible is defined before usage
- Fix compilation of key-manager submodule
- Fix file indentation

Change-Id: If3a05643ecade3b598be16654fa687b7a92bed7e
Signed-off-by: Ernest Borowski <e.borowski@partner.samsung.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index addcc7dd769946851ed27ff8d8ebfab4a37cb3ec..6c95cc08e1a188449fa985615ea0d39ead61394d 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,14 +1,3 @@
-IF( DEFINED MODULE )
-       SET(MAXCOUNT 1)
-       SET(SPEEDCHECK 0)
-       SET(MEMORYCHECK 0)
-       SET(DEBUGVAL 0)
-       SET(CONFIGFILEPATH "\"/home/owner/share/TC_Config.txt\"")
-       SET(TCT_CONFIG "\"/home/owner/share/TCT_CONFIG\"")
-       SET(ERR_LOG "\"/tmp/tclog\"")
-       SET(ERR_UTC_LOG "\"/tmp/utclog\"")
-       #~ SET(TIME_INTERVAL 500)
-       #~ add_definitions(-DINTERVAL=${TIME_INTERVAL})
 IF(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)
        SET(ARCHTYPE "\"armv7l\"")
        SET(ISDEVICE 1)
@@ -16,65 +5,63 @@ ELSE()
        SET(ARCHTYPE "\"i586\"")
        SET(ISDEVICE 0)
 ENDIF()
-IF(ASANBUILD STREQUAL true)
-       MESSAGE(STATUS "*********${BUILDTCTYPE}/${MODULE} : Building for Address Sanitizer************************************************************************")
-       SET(ASAN 1)
-       add_definitions(-DASAN=${ASAN})
-ENDIF()
-IF(DEVICE_BUILD_TYPE STREQUAL mobile)
-       SET(MOBILE 1)
-       add_definitions(-DMOBILE=${MOBILE})
-ENDIF()
-IF(DEVICE_BUILD_TYPE STREQUAL wearable)
-       SET(WEARABLE 1)
-       add_definitions(-DWEARABLE=${WEARABLE})
-ENDIF()
-IF(DEVICE_BUILD_TYPE STREQUAL tv)
-       SET(TV 1)
-       add_definitions(-DTV=${TV})
-ENDIF()
-IF(DEVICE_BUILD_TYPE STREQUAL tizeniot)
-       SET(TIZENIOT 1)
-       add_definitions(-DTIZENIOT=${TIZENIOT})
-ENDIF()
+
+SET(COMMON_FILE "${CMAKE_SOURCE_DIR}/src/common/tct_common.c")
+SET(COMMON_APP_FILE "${CMAKE_SOURCE_DIR}/src/common/tct_app_common.c")
+SET(MAXCOUNT 1)
+SET(SPEEDCHECK 0)
+SET(MEMORYCHECK 0)
+SET(DEBUGVAL 0)
+SET(CONFIGFILEPATH "\"/home/owner/share/TC_Config.txt\"")
+SET(ERR_LOG "\"/tmp/tclog\"")
+SET(ERR_UTC_LOG "\"/tmp/utclog\"")
+SET(TCT_CONFIG "\"/home/owner/share/TCT_CONFIG\"")
+add_definitions(-DARCH_TYPE=${ARCHTYPE})
+add_definitions(-DIS_DEVICE=${ISDEVICE})
+add_definitions(-DMAX_COUNT=${MAXCOUNT})
+add_definitions(-DSPEED_CHECK=${SPEEDCHECK})
+add_definitions(-DMEMORY_CHECK=${MEMORYCHECK})
+add_definitions(-DDEBUG=${DEBUGVAL})
+add_definitions(-DCONFIGFILE_PATH=${CONFIGFILEPATH})
+add_definitions(-DERR_LOG=${ERR_LOG})
+add_definitions(-DERR_UTC_LOG=${ERR_UTC_LOG})
+add_definitions(-DTCT_CONFIG=${TCT_CONFIG})
+
+IF( DEFINED MODULE )
+       #~ SET(TIME_INTERVAL 500)
+       #~ add_definitions(-DINTERVAL=${TIME_INTERVAL})
+       IF(NOT DEFINED BUILDTCTYPE)
+               MESSAGE(FATAL_ERROR "BUILDTCTYPE variable not defined")
+       ENDIF(NOT DEFINED BUILDTCTYPE)
+       IF(NOT DEFINED DEVICE_BUILD_TYPE)
+               MESSAGE(FATAL_ERROR "DEVICE_BUILD_TYPE variable not defined")
+       ENDIF(NOT DEFINED DEVICE_BUILD_TYPE)
+
+       IF(ASANBUILD STREQUAL true)
+               MESSAGE(STATUS "*********${BUILDTCTYPE}/${MODULE} : Building for Address Sanitizer************************************************************************")
+               SET(ASAN 1)
+               add_definitions(-DASAN=${ASAN})
+       ENDIF()
+       IF(DEVICE_BUILD_TYPE STREQUAL mobile)
+               SET(MOBILE 1)
+               add_definitions(-DMOBILE=${MOBILE})
+       ENDIF()
+       IF(DEVICE_BUILD_TYPE STREQUAL wearable)
+               SET(WEARABLE 1)
+               add_definitions(-DWEARABLE=${WEARABLE})
+       ENDIF()
+       IF(DEVICE_BUILD_TYPE STREQUAL tv)
+               SET(TV 1)
+               add_definitions(-DTV=${TV})
+       ENDIF()
+       IF(DEVICE_BUILD_TYPE STREQUAL tizeniot)
+               SET(TIZENIOT 1)
+               add_definitions(-DTIZENIOT=${TIZENIOT})
+       ENDIF()
        MESSAGE(STATUS "*********src/CMakeLists.txt: DEVICE BUILD TYPE: ${DEVICE_BUILD_TYPE}")
-       add_definitions(-DARCH_TYPE=${ARCHTYPE})
-       add_definitions(-DIS_DEVICE=${ISDEVICE})
-       add_definitions(-DMAX_COUNT=${MAXCOUNT})
-       add_definitions(-DSPEED_CHECK=${SPEEDCHECK})
-       add_definitions(-DMEMORY_CHECK=${MEMORYCHECK})
-       add_definitions(-DDEBUG=${DEBUGVAL})
-       add_definitions(-DCONFIGFILE_PATH=${CONFIGFILEPATH})
-       add_definitions(-DTCT_CONFIG=${TCT_CONFIG})
-       add_definitions(-DERR_LOG=${ERR_LOG})
-       add_definitions(-DERR_UTC_LOG=${ERR_UTC_LOG})
-       SET(COMMON_FILE "../../common/tct_common.c")
-       SET(COMMON_APP_FILE "../../common/tct_app_common.c")
        MESSAGE(STATUS "Building: ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}")
        ADD_SUBDIRECTORY(${BUILDTCTYPE}/${MODULE})
 ELSE( DEFINED MODULE )
-       SET(MAXCOUNT 1)
-       SET(SPEEDCHECK 0)
-       SET(MEMORYCHECK 0)
-       SET(DEBUGVAL 0)
-       SET(CONFIGFILEPATH "\"/home/owner/share/TC_Config.txt\"")
-       SET(ERR_LOG "\"/tmp/tclog\"")
-       IF(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)
-               SET(ARCHTYPE "\"armv7l\"")
-               SET(ISDEVICE 1)
-       ELSE()
-               SET(ARCHTYPE "\"i586\"")
-               SET(ISDEVICE 0)
-       ENDIF()
-       add_definitions(-DARCH_TYPE=${ARCHTYPE})
-       add_definitions(-DIS_DEVICE=${ISDEVICE})
-       add_definitions(-DMAX_COUNT=${MAXCOUNT})
-       add_definitions(-DSPEED_CHECK=${SPEEDCHECK})
-       add_definitions(-DMEMORY_CHECK=${MEMORYCHECK})
-       add_definitions(-DDEBUG=${DEBUGVAL})
-       add_definitions(-DCONFIGFILE_PATH=${CONFIGFILEPATH})
-       add_definitions(-DERR_LOG=${ERR_LOG})
-       add_definitions(-DERR_UTC_LOG=${ERR_UTC_LOG})
 
        MESSAGE(STATUS "Building: ${CMAKE_CURRENT_SOURCE_DIR}/utc/audio-io")
        ADD_SUBDIRECTORY(utc/audio-io)

diff --git a/src/itc/key-manager/CMakeLists.txt b/src/itc/key-manager/CMakeLists.txt
index c21bbe5fb8182ba422560cb5e78f57cb3b13655f..a53419cf7a202ef0805f8e7397233ecff05be4f5 100755 (executable)
--- a/src/itc/key-manager/CMakeLists.txt
+++ b/src/itc/key-manager/CMakeLists.txt
@@ -15,17 +15,22 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
        bundle
        capi-system-info
        glib-2.0
-       dlog 
+       dlog
 )
 
 INCLUDE_DIRECTORIES(
        ${${CAPI_LIB}_INCLUDE_DIRS}
 )
 
+IF(NOT DEFINED COMMON_FILE)
+       MESSAGE(FATAL_ERROR "COMMON_FILE variable not defined")
+ENDIF(NOT DEFINED COMMON_FILE)
+
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.c ${TC_SOURCES} ${COMMON_FILE})
 TARGET_LINK_LIBRARIES(${EXEC_NAME}
        ${${CAPI_LIB}_LIBRARIES}
-       bundle
+       resolv
+       pthread
 )
 
 INSTALL(PROGRAMS ${EXEC_NAME}

diff --git a/src/utc/key-manager/CMakeLists.txt b/src/utc/key-manager/CMakeLists.txt
index e2f3648459059ebcdce236e9512489ecf51170de..6b65bb6b114bd8ff716644d05692a5f54ce08b5b 100644 (file)
--- a/src/utc/key-manager/CMakeLists.txt
+++ b/src/utc/key-manager/CMakeLists.txt
@@ -17,16 +17,22 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
        capi-system-info
        glib-2.0
        storage
-       dlog 
+       dlog
 )
 
 INCLUDE_DIRECTORIES(
     ${${CAPI_LIB}_INCLUDE_DIRS}
 )
 
+IF(NOT DEFINED COMMON_FILE)
+       MESSAGE(FATAL_ERROR "COMMON_FILE variable not defined")
+ENDIF(NOT DEFINED COMMON_FILE)
+
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.c ${TC_SOURCES} ${COMMON_FILE})
 TARGET_LINK_LIBRARIES(${EXEC_NAME}
     ${${CAPI_LIB}_LIBRARIES}
+       resolv
+       pthread
 )
 
 INSTALL(PROGRAMS ${EXEC_NAME}