afeica
/
cocos-engine-external
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
bofeng-song 2022-01-26 17:36:51 +08:00 committed by GitHub
parent cd659ed8ff
commit 7c33bc6102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sources/boost-source/boost.cmake
View File

@ -8,10 +8,9 @@ set(BOOST_LIB_NAMES
foreach(lib ${BOOST_LIB_NAMES}) foreach(lib ${BOOST_LIB_NAMES})
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/${lib} boost/${lib}) add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/${lib} boost/${lib})
set_target_properties(boost_${lib} PROPERTIES FOLDER Utils) set_target_properties(boost_${lib} PROPERTIES FOLDER Utils)
list(APPEND CC_EXTERNAL_LIBS boost_${lib}) target_compile_definitions(boost_${lib} PUBLIC
foreach(lib ${BOOST_LIBS})
set_target_properties(${lib} PROPERTIES FOLDER Utils)
target_compile_definitions(${lib} PUBLIC
BOOST_UUID_FORCE_AUTO_LINK BOOST_UUID_FORCE_AUTO_LINK
) )
list(APPEND CC_EXTERNAL_LIBS boost_${lib})
endforeach() endforeach()