diff --git a/CMakeLists.txt b/CMakeLists.txt
index 888e4a70..2b1838d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,12 +8,13 @@ include(Version)
 
 set(CMAKE_MACOSX_RPATH 0)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-rtti")
+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 ddc15145..84fe66d9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,21 +1,16 @@
 cmake_minimum_required(VERSION 3.5)
 
-#SET(lib_name hos_client_cpp)
 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})
+include_directories(/usr/local/include)
 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-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)
+target_link_libraries(${lib_name}_shared libaws-cpp-sdk-core.so libaws-cpp-sdk-s3.so libMESA_field_stat2.so libcurl.so libpthread.so)
 set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name})
 
 #for ASAN
@@ -36,7 +31,4 @@ elseif(ASAN_OPTION MATCHES "THREAD")
 endif()
 # end of for ASAN
 
-#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)