diff options
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | support/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | support/aws-sdk-cpp-master.zip | bin | 93349835 -> 89064368 bytes |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4b0f8e99..5bcb016a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,10 +4,12 @@ cmake_minimum_required(VERSION 3.5) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -shared -fPIC -std=c++11") SET(CMAKE_BUILD_TYPE Debug) +include_directories(${CMAKE_INSTALL_PREFIX}/include/MESA) link_directories(${SUPPORT_INSTALL_PREFIX}) +link_directories(${CMAKE_INSTALL_PREFIX}/lib) set(CMKAE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -shared -fPIC") add_library(${lib_name}_shared SHARED hos_client.cpp hos_hash.cpp) -target_link_libraries(${lib_name}_shared libaws-cpp-sdk-s3.so libaws-cpp-sdk-core.so) +target_link_libraries(${lib_name}_shared libaws-cpp-sdk-s3.so libaws-cpp-sdk-core.so libMESA_field_stat2.so) set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name}) add_dependencies(${lib_name}_shared aws-sdk-cpp-master-static) diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index 9db59952..fe3ff9c5 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -3,7 +3,7 @@ include(ExternalProject) set(AWSS3_ROOT ${CMAKE_CURRENT_BINARY_DIR}) set(AWSS3_URL ${CMAKE_CURRENT_SOURCE_DIR}/aws-sdk-cpp-master.zip) #set(AWSS3_URL_MD5 a94cce4fe5003acf55fe1eac8c49ad4f) -set(AWSS3_URL_MD5 1bb2784d5f39ff05fcf2c30092dc8a66) +set(AWSS3_URL_MD5 9128a9cc628a24f0c2f8b19e36d8327c) set(AWSS3_CONFIGURE cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && cmake . -DBUILD_ONLY=s3 -DCMAKE_BUILD_TYPE=Debug) set(AWSS3_MAKE cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && make) set(AWSS3_INSTALL cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && make install PREFIX=${SUPPORT_INSTALL_PREFIX}) diff --git a/support/aws-sdk-cpp-master.zip b/support/aws-sdk-cpp-master.zip Binary files differindex 327ed3eb..e5a15c20 100644 --- a/support/aws-sdk-cpp-master.zip +++ b/support/aws-sdk-cpp-master.zip |