1*4882a593Smuzhiyundiff -urN -x .git orig/CMakeLists.txt patched/CMakeLists.txt 2*4882a593Smuzhiyun--- orig/CMakeLists.txt 2020-08-07 21:58:34.656773928 +0900 3*4882a593Smuzhiyun+++ patched/CMakeLists.txt 2020-08-10 15:08:31.800278357 +0900 4*4882a593Smuzhiyun@@ -119,13 +119,28 @@ 5*4882a593Smuzhiyun endif() 6*4882a593Smuzhiyun endif() 7*4882a593Smuzhiyun 8*4882a593Smuzhiyun+include(CheckCXXSourceCompiles) 9*4882a593Smuzhiyun+CHECK_CXX_SOURCE_COMPILES(" 10*4882a593Smuzhiyun+ #include <atomic> 11*4882a593Smuzhiyun+ int main(int argc, char **argv) { 12*4882a593Smuzhiyun+ uint8_t m; 13*4882a593Smuzhiyun+ __atomic_load_8(&m, 0); 14*4882a593Smuzhiyun+ __atomic_fetch_add_1(&m , 0, 0); 15*4882a593Smuzhiyun+ return 0; 16*4882a593Smuzhiyun+ }" 17*4882a593Smuzhiyun+ HAVE_ATOMIC 18*4882a593Smuzhiyun+) 19*4882a593Smuzhiyun+if(NOT HAVE_ATOMIC) 20*4882a593Smuzhiyun+ set(LIB_ATOMIC atomic) 21*4882a593Smuzhiyun+endif() 22*4882a593Smuzhiyun+ 23*4882a593Smuzhiyun # Use ccache if present 24*4882a593Smuzhiyun-find_program(CCACHE_FOUND ccache) 25*4882a593Smuzhiyun-if(CCACHE_FOUND) 26*4882a593Smuzhiyun- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) 27*4882a593Smuzhiyun- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) 28*4882a593Smuzhiyun- message("-- Found ccache: ${CCACHE_FOUND}") 29*4882a593Smuzhiyun-endif(CCACHE_FOUND) 30*4882a593Smuzhiyun+#find_program(CCACHE_FOUND ccache) 31*4882a593Smuzhiyun+#if(CCACHE_FOUND) 32*4882a593Smuzhiyun+# set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) 33*4882a593Smuzhiyun+# set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) 34*4882a593Smuzhiyun+# message("-- Found ccache: ${CCACHE_FOUND}") 35*4882a593Smuzhiyun+#endif(CCACHE_FOUND) 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun if (UNIX AND USE_GOLD_LINKER AND NOT APPLE ) 38*4882a593Smuzhiyun execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE ld_version) 39*4882a593Smuzhiyun@@ -303,8 +318,10 @@ 40*4882a593Smuzhiyun GIT_TAG "f3294d9d86e6a7915a967efff2842089b8b0d071" # Version 7.64.0 41*4882a593Smuzhiyun SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-src" 42*4882a593Smuzhiyun LIST_SEPARATOR % # This is needed for passing semicolon-separated lists 43*4882a593Smuzhiyun+ TLS_VERIFY OFF 44*4882a593Smuzhiyun CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS} 45*4882a593Smuzhiyun "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-install" 46*4882a593Smuzhiyun+ "-DCMAKE_INSTALL_LIBDIR=lib${LIBSUFFIX}" 47*4882a593Smuzhiyun -DCMAKE_POSITION_INDEPENDENT_CODE=ON 48*4882a593Smuzhiyun -DBUILD_CURL_EXE=OFF 49*4882a593Smuzhiyun -DBUILD_TESTING=OFF 50*4882a593Smuzhiyundiff -urN -x .git orig/libminifi/CMakeLists.txt patched/libminifi/CMakeLists.txt 51*4882a593Smuzhiyun--- orig/libminifi/CMakeLists.txt 2020-08-07 21:58:34.676773928 +0900 52*4882a593Smuzhiyun+++ patched/libminifi/CMakeLists.txt 2020-08-10 15:06:17.124278642 +0900 53*4882a593Smuzhiyun@@ -108,6 +108,7 @@ 54*4882a593Smuzhiyun add_library(spdlog STATIC ${SPD_SOURCES}) 55*4882a593Smuzhiyun add_library(core-minifi STATIC ${SOURCES}) 56*4882a593Smuzhiyun target_link_libraries(core-minifi ${CMAKE_DL_LIBS} yaml-cpp) 57*4882a593Smuzhiyun+target_link_libraries(core-minifi ${LIB_ATOMIC}) 58*4882a593Smuzhiyun 59*4882a593Smuzhiyun #target_link_libraries(core-minifi PRIVATE bsdiff ) 60*4882a593Smuzhiyun 61