diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | support/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | support/aws-sdk-cpp-master.zip | bin | 76206916 -> 76206948 bytes |
4 files changed, 5 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6668e294..9c691f24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,12 +10,12 @@ set(CMAKE_MACOSX_RPATH 0) #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -fno-rtti") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall ") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xlinker --unresolved-symbols=ignore-in-shared-libs") +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xlinker --unresolved-symbols=ignore-in-shared-libs") set(CMAKE_INSTALL_PREFIX /opt/MESA) -#set(SUPPORT_INSTALL_PREFIX /usr/local/lib64) +set(SUPPORT_INSTALL_PREFIX /usr/local/lib64) -#add_subdirectory(support) +add_subdirectory(support) add_subdirectory(src) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libhos-client-cpp.so DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 84fe66d9..1d631e91 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,7 +10,7 @@ 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-core.so libaws-cpp-sdk-s3.so libMESA_field_stat2.so libcurl.so libpthread.so) +target_link_libraries(${lib_name}_shared PUBLIC libaws-cpp-sdk-core.a libaws-cpp-sdk-s3.a libMESA_field_stat2.so libcurl.so libpthread.so) set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name}) #for ASAN diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index 0ee4df4f..fec271eb 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -2,10 +2,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 dcdcd3cd6d2864f7efbfa90db6f5bf32) -set(AWSS3_URL_MD5 e2c1620436bab8f4b8cd4db99fbd8749) -#set(AWSS3_URL_MD5 1bb2784d5f39ff05fcf2c30092dc8a66) +set(AWSS3_URL_MD5 37cb7cbc2cbf72eac711ae300013c7b5) set(AWSS3_CONFIGURE cd ${AWSS3_ROOT}/aws-sdk-cpp-master/src/aws-sdk-cpp-master && cmake . -DBUILD_ONLY=s3) 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 1a5b0bda..98a40af4 100644 --- a/support/aws-sdk-cpp-master.zip +++ b/support/aws-sdk-cpp-master.zip |