From a63b66132719a76b12b3e3d088cf7bc7b35a2a25 Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Thu, 14 Jun 2018 18:22:46 +0100 Subject: [PATCH] Update gradle of sonar cpp --- xplat/CMakeLists.txt | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/xplat/CMakeLists.txt b/xplat/CMakeLists.txt index c5d82dcd0..4dcdfaa56 100644 --- a/xplat/CMakeLists.txt +++ b/xplat/CMakeLists.txt @@ -2,17 +2,21 @@ cmake_minimum_required (VERSION 3.6.0) project(sonarcpp CXX) set(CMAKE_VERBOSE_MAKEFILE on) set(PACKAGE_NAME sonarcpp) +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_EXTENSIONS OFF) set(third_party_ndk ../android/build/third-party-ndk) set(libfolly_DIR ${third_party_ndk}/folly/) set(easywsclient_DIR ../libs/) set(glog_DIR ${third_party_ndk}/glog) set(BOOST_DIR ${third_party_ndk}/boost/boost_1_63_0/) - +set(LIBEVENT_DIR ${third_party_ndk}/LibEvent/libevent-release-2.1.9/) set(DOUBLECONVERSION_DIR ${third_party_ndk}/double-conversion/double-conversion-3.0.0/) +set(OPENSSL_DIR ${third_party_ndk}/OpenSSL/openssl-android-1.0.0/) list(APPEND dir_list ./) list(APPEND dir_list ./Sonar) + include_directories(${dir_list}) add_compile_options(-DFOLLY_NO_CONFIG @@ -24,7 +28,6 @@ add_compile_options(-DFOLLY_NO_CONFIG -DFOLLY_HAVE_PREADV=0 -frtti -fexceptions - -std=c++14 -Wno-error -Wno-unused-local-typedefs -Wno-unused-variable @@ -51,10 +54,19 @@ target_include_directories(${PACKAGE_NAME} PRIVATE ${libfolly_DIR} ${BOOST_DIR} ${BOOST_DIR}/../ + ${LIBEVENT_DIR}/ + ${LIBEVENT_DIR}/include/ + ${LIBEVENT_DIR}/include/event2 + ${OPENSSL_DIR}/jni/openssl-android/ + ${OPENSSL_DIR}/jni/openssl-android/include + ${OPENSSL_DIR}/jni/openssl-android/include/openssl ${glog_DIR} ${glog_DIR}/../ ${glog_DIR}/glog-0.3.5/src/ ${easywsclient_DIR} ) -target_link_libraries(${PACKAGE_NAME} folly easywsclient glog double-conversion log) +set(OPENSSL_LINK_DIRECTORIES ${third_party_ndk}/OpenSSL/libs/${ANDROID_ABI}/) +find_path(OPENSSL_LIBRARY libssl.so HINTS ${OPENSSL_LINK_DIRECTORIES}) + +target_link_libraries(${PACKAGE_NAME} folly easywsclient glog double-conversion log event ${OPENSSL_LINK_DIRECTORIES}/libssl.so ${OPENSSL_LINK_DIRECTORIES}/libcrypto.so)