build-script: Fix build errors due to the cmake upgrade

After the version of cmake is upgraded, strings include semicolon if it was a semicolon-separated list.
It makes cflags polluted, so build errors occurred.

To fix it, explicit removing calls are added.

Change-Id: Ie4962a2c4de9a342f1d0bc13d0733eba31c3952a
Signed-off-by: Sung-hun Kim <sfoon.kim@samsung.com>

diff --git a/src/crash-json2info/CMakeLists.txt b/src/crash-json2info/CMakeLists.txt
index 888c1d163557ca3f5bbf9f218666d236f843a9e4..2a87502bed379370f5534cc4b12f866da9284a74 100644 (file)
--- a/src/crash-json2info/CMakeLists.txt
+++ b/src/crash-json2info/CMakeLists.txt
@@ -12,6 +12,9 @@ add_executable(${CRASH_JSON_TO_INFO_BIN} ${CRASH_JSON_TO_INFO_SRCS})
 include(FindPkgConfig)
 pkg_check_modules(JSON REQUIRED json-c)
 pkg_check_modules(DLOG REQUIRED dlog)
+# Remove semicolon in CFLAGS string
+list(JOIN JSON_CFLAGS " " JSON_CFLAGS)
+list(JOIN DLOG_CFLAGS " " DLOG_CFLAGS)
 set_property(TARGET ${CRASH_JSON_TO_INFO_BIN} APPEND_STRING PROPERTY COMPILE_FLAGS "${JSON_CFLAGS} ${DLOG_CFLAGS}")
 
 # Linking

diff --git a/src/crash-stack/CMakeLists.txt b/src/crash-stack/CMakeLists.txt
index a6af735a5e260007a85f34e389ca568829342582..c1d8d611c7de51f085b5656bb4afe4f193833094 100644 (file)
--- a/src/crash-stack/CMakeLists.txt
+++ b/src/crash-stack/CMakeLists.txt
@@ -31,6 +31,11 @@ pkg_check_modules(LIBUNWIND REQUIRED libunwind-generic)
 pkg_check_modules(DLOG REQUIRED dlog)
 pkg_check_modules(JSON REQUIRED json-c)
 pkg_check_modules(LIBCRYPTO REQUIRED libcrypto3)
+# Remove semicolon in cflags string
+list(JOIN LIBUNWIND_CFLAGS " " LIBUNWIND_CFLAGS)
+list(JOIN JSON_CFLAGS " " JSON_CFLAGS)
+list(JOIN DLOG_CFLAGS " " DLOG_CFLAGS)
+list(JOIN LIBCRYPTO_CFLAGS " " LIBCRYPTO_CFLAGS)
 set_property(TARGET ${CRASH_STACK_BIN} APPEND_STRING PROPERTY COMPILE_FLAGS "${JSON_CFLAGS} ${LIBUNWIND_CFLAGS} ${DLOG_CFLAGS} ${LIBCRYPTO_CFLAGS}")
 
 # Linking

diff --git a/src/livedumper/CMakeLists.txt b/src/livedumper/CMakeLists.txt
index c0a6bc956013d6b832d3f33bd422711e4ebf8fd8..6f1630c108347644765e492fa14b03619df29ca5 100644 (file)
--- a/src/livedumper/CMakeLists.txt
+++ b/src/livedumper/CMakeLists.txt
@@ -22,6 +22,8 @@ target_link_libraries(${LIVEDUMPER_BIN} -lthread_db -pie)
 if("${LOGGER}" STREQUAL "dlog")
        include(FindPkgConfig)
        pkg_check_modules(DLOG_REQUIRED dlog)
+       # Remove semicolon in cflags string
+       list(JOIN DLOG_CFLAGS " " DLOG_CFLAGS)
        set_property(TARGET ${LIVEDUMPER_BIN} APPEND_STRING PROPERTY COMPILE_FLAGS ${DLOG_CFLAGS})
        target_link_libraries(${LIVEDUMPER_BIN} ${DLOG_LIBRARIES})
 endif()