diff --git a/CMakeLists.txt b/CMakeLists.txt index 8696f224..888e4a70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,9 +11,9 @@ set(CMAKE_MACOSX_RPATH 0) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") 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 95fabd54..7acf745d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,11 +6,15 @@ SET(CMAKE_BUILD_TYPE Debug) include_directories(${CMAKE_INSTALL_PREFIX}/include/MESA) #link_directories(${SUPPORT_INSTALL_PREFIX}) +link_directories(/usr/local/lib64) link_directories(${CMAKE_INSTALL_PREFIX}/lib) link_directories(${CMAKE_INSTALL_PREFIX}/lib64) set(CMKAE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -shared -fPIC") +#link_libraries(libaws-c-common.so libaws-checksums.so libaws-c-event-stream.so libaws-cpp-sdk-core.so libaws-cpp-sdk-s3.so libMESA_field_stat2.so libcurl.so) + 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 libaws-c-common.so libaws-checksums.so libaws-c-event-stream.so libMESA_field_stat2.so libcurl.so) +#target_link_libraries(${lib_name}_shared libaws-c-common.so libaws-checksums.so libaws-c-event-stream.so libaws-cpp-sdk-core.so libaws-cpp-sdk-s3.so libMESA_field_stat2.so libcurl.so) +target_link_libraries(${lib_name}_shared libMESA_field_stat2.so libcurl.so) #target_link_libraries(${lib_name}_shared libMESA_field_stat2.so libcurl.so) set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name}) diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index 98f6eb03..0ee4df4f 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -3,7 +3,8 @@ 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 dcdcd3cd6d2864f7efbfa90db6f5bf32) +set(AWSS3_URL_MD5 e2c1620436bab8f4b8cd4db99fbd8749) #set(AWSS3_URL_MD5 1bb2784d5f39ff05fcf2c30092dc8a66) 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) diff --git a/support/aws-sdk-cpp-master.zip b/support/aws-sdk-cpp-master.zip index b626df62..1a5b0bda 100644 Binary files a/support/aws-sdk-cpp-master.zip and b/support/aws-sdk-cpp-master.zip differ diff --git a/tags b/tags deleted file mode 100644 index 53a42842..00000000 Binary files a/tags and /dev/null differ