From bf70a28b3867ba2e6a93feb7b20c66d0a33934b7 Mon Sep 17 00:00:00 2001 From: Sunmin Lee Date: Thu, 26 Jul 2018 16:27:52 +0900 Subject: [PATCH] Require libtota as shared As a default, make tota-ua (delta.ua) require libtota.so instead of static one. Change-Id: I7477e7ad6f2c60cdb1ae45d356a042c43a2534f3 Signed-off-by: Sunmin Lee --- CMakeLists.txt | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34507ad..a51d900 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,43 +10,24 @@ SET(SRCS src/ua.c ) - - STRING(FIND ${CMAKE_C_FLAGS} "mfloat-abi=hard" IFFOUND1) STRING(FIND ${CMAKE_C_FLAGS} "mhard-float" IFFOUND2) -IF(${IFFOUND1} GREATER 0 OR ${IFFOUND2} GREATER 0) - MESSAGE("hard") - SET(LIBS - libtota.a - ) -ELSE(${IFFOUND1} GREATER 0 OR ${IFFOUND2} GREATER 0) - MESSAGE("soft") - SET(LIBS - libtota.a - ) -ENDIF(${IFFOUND1} GREATER 0 OR ${IFFOUND2} GREATER 0) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/) - -SET(VENDOR "samsung") SET(PACKAGE ${PROJECT_NAME}) SET(PKGNAME "${PACKAGE}") SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(BINDIR "${PREFIX}/bin") SET(PKGDIR "${PREFIX}/share/fota") SET(RESDIR "${PKGDIR}/res") -SET(CFGDIR "${PKGDIR}/config") SET(EXECNAME "delta.ua") - IF("${CMAKE_BUILD_TYPE}" STREQUAL "") SET(CMAKE_BUILD_TYPE "Release") ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "") MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") - INCLUDE(FindPkgConfig) pkg_check_modules(pkgs REQUIRED tota @@ -57,8 +38,6 @@ FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) - - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -fPIE") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") SET(CMAKE_C_FLAGS_RELEASE "-O2") @@ -79,7 +58,7 @@ ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -pie") ADD_EXECUTABLE(${EXECNAME} ${SRCS}) -TARGET_LINK_LIBRARIES(${EXECNAME} ${pkgs_LDFLAGS} ${LIBS}) +TARGET_LINK_LIBRARIES(${EXECNAME} ${pkgs_LDFLAGS}) INSTALL(TARGETS ${EXECNAME} DESTINATION ${BINDIR}) IF("${FOTA_GUI_TYPE}" STREQUAL "GUI_TW") -- 2.7.4