From 7c33bc6102303f567d3dd07e1108160cecccc530 Mon Sep 17 00:00:00 2001
From: bofeng-song <bofeng.song@chukong-inc.com>
Date: Wed, 26 Jan 2022 17:36:51 +0800
Subject: [PATCH] fix merge conflict problem(it may cause editor Build failed)
 (#218)

---
 sources/boost-source/boost.cmake | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sources/boost-source/boost.cmake b/sources/boost-source/boost.cmake
index 5cb87428..f9c8a7d0 100644
--- a/sources/boost-source/boost.cmake
+++ b/sources/boost-source/boost.cmake
@@ -8,10 +8,9 @@ set(BOOST_LIB_NAMES
 foreach(lib ${BOOST_LIB_NAMES})
     add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/${lib} boost/${lib})
     set_target_properties(boost_${lib} PROPERTIES FOLDER Utils)
-    list(APPEND CC_EXTERNAL_LIBS boost_${lib})
-foreach(lib ${BOOST_LIBS})
-    set_target_properties(${lib} PROPERTIES FOLDER Utils)
-    target_compile_definitions(${lib} PUBLIC
+    target_compile_definitions(boost_${lib} PUBLIC
         BOOST_UUID_FORCE_AUTO_LINK
     )
+    list(APPEND CC_EXTERNAL_LIBS boost_${lib})
 endforeach()
+