fix merge conflict problem(it may cause editor Build failed) (#218 )

Merge pull request #216 from cocos-creator/v3.5
2022-01-26 17:36:51 +08:00 · 2022-01-26 13:56:11 +08:00
1 changed files with 4 additions and 1 deletions
@@ -7,7 +7,10 @@ set(BOOST_LIB_NAMES

 foreach(lib ${BOOST_LIB_NAMES})
    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/${lib} boost/${lib})
-    target_compile_definitions(boost_${lib} PUBLIC BOOST_UUID_FORCE_AUTO_LINK)
    set_target_properties(boost_${lib} PROPERTIES FOLDER Utils)
+    target_compile_definitions(boost_${lib} PUBLIC
+        BOOST_UUID_FORCE_AUTO_LINK
+    )
    list(APPEND CC_EXTERNAL_LIBS boost_${lib})
 endforeach()
+
Author	SHA1	Message	Date
bofeng-songandGitHub	7c33bc6102	fix merge conflict problem(it may cause editor Build failed) (#218 )	2022-01-26 17:36:51 +08:00
minggoandGitHub	cd659ed8ff	Merge pull request #216 from cocos-creator/v3.5	2022-01-26 13:56:11 +08:00