Merge branch 'master' into dev

wangzhengquan

2021-02-20 8bfe9f711612efde96a0d7b7aa3ba7178ab51640

 test/CMakeLists.txt

@@ -64,4 +64,9 @@
                             ${EXTRA_INCLUDES}
                            )


add_executable(thread_set thread_set.cpp )
target_link_libraries(thread_set PRIVATE  ${EXTRA_LIBS} )
target_include_directories(thread_set PRIVATE
                            "${PROJECT_BINARY_DIR}"
                             ${EXTRA_INCLUDES}
                            )