diff options
| author | 彭宣正 <[email protected]> | 2021-02-01 20:00:24 +0800 |
|---|---|---|
| committer | 彭宣正 <[email protected]> | 2021-02-01 20:00:24 +0800 |
| commit | 46c2e5e5acdd0d4276e4ecd019bda2ea0a6cbd7e (patch) | |
| tree | f4cc09c82879d718de7af5d378f89cd471e18983 | |
| parent | d4cc6cf842ef781e85c486b63cac9c8464472c97 (diff) | |
修改依赖包路径v1.0.6
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 888e4a70..8696f224 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 f600eabd..95fabd54 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,11 +5,12 @@ 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(${SUPPORT_INSTALL_PREFIX}) link_directories(${CMAKE_INSTALL_PREFIX}/lib) +link_directories(${CMAKE_INSTALL_PREFIX}/lib64) 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 libMESA_field_stat2.so libcurl.so) +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 libMESA_field_stat2.so libcurl.so) set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name}) @@ -31,7 +32,7 @@ elseif(ASAN_OPTION MATCHES "THREAD") endif() # end of for ASAN -add_dependencies(${lib_name}_shared aws-sdk-cpp-master-static) +#add_dependencies(${lib_name}_shared aws-sdk-cpp-master-static) #install(TARGETS ${lib_name}_shared LIBRARY DESTINATION /opt/MESA/lib) install(TARGETS ${lib_name}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES) |