Merge pull request #82 from awslabs/revert-81-TaskRoleCredentials

Revert "Improving CMake user experience"

Author: JonathanHenson

AWSSDK/AWSSDKConfig.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License").
 # You may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ find_package(Git)
 
 # Cmake invocation variables:
 #   CUSTOM_MEMORY_MANAGEMENT - if set to 1, generates the sdk project files with custom memory management enabled, otherwise disables it
-#   BUILD_ONLY - only build xxx, a semi-colon delimited list, if this is set we will build only the projects listed. Core will always be built as will its unit tests.
+#   BUILD_ONLY - a semi-colon delimited list, if this is set we will build only the projects listed. Core will always be built as will its unit tests.
 #                    Also if a high level client is specified then we will build its dependencies as well. If a project has tests, the tests will be built.
 #   REGENERATE_CLIENTS - all clients being built on this run will be regenerated from the api definitions, this option involves some setup of python, java 8, jdk 1.8, and maven
 #   ADD_CUSTOM_CLIENTS - semi-colon delimited list of format serviceName=<yourserviceName>,version=<theVersionNumber>;serviceName2=<yourOtherServiceName>,version=<versionNumber2>
@@ -67,12 +67,8 @@ endif()
 
 SET(PYTHON_CMD "python")
 
-# CMAKE_MODULE_PATH is a CMAKE variable. It contains a list of paths 
-# which could be used to search CMAKE modules by "include()" or "find_package()", but the default value is empty.
-# Add cmake dir to search list
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
-# include() will "load and run" cmake script
 include(resolve_platform)
 include(CMakePackageConfigHelpers)
 
@@ -129,45 +125,19 @@ include(build_external)
 
 if(ENABLE_BCRYPT_ENCRYPTION)
     set(CRYPTO_LIBS Bcrypt)
-    set(CRYPTO_LIBS_ABSTRACT_NAME Bcrypt)
 elseif(ENABLE_OPENSSL_ENCRYPTION)
     set(CRYPTO_LIBS ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
-    set(CRYPTO_LIBS_ABSTRACT_NAME ssl z)
 endif()
 
 if(ENABLE_CURL_CLIENT)
     set(CLIENT_LIBS ${CURL_LIBRARIES})
-    set(CLIENT_LIBS_ABSTRACT_NAME curl)
 elseif(ENABLE_WINDOWS_CLIENT)
     if(USE_IXML_HTTP_REQUEST_2)
         set(CLIENT_LIBS msxml6 runtimeobject)
-        set(CLIENT_LIBS_ABSTRACT_NAME msxml6 runtimeobject)
     else()
         set(CLIENT_LIBS Wininet winhttp)
-        set(CLIENT_LIBS_ABSTRACT_NAME Wininet winhttp)
     endif()
 endif()
 
-# setup user specified installation directory if any, regardless previous platform default settings
-if (CMAKE_INSTALL_BINDIR)
-    SET(BINARY_DIRECTORY "${CMAKE_INSTALL_BINDIR}")
-endif()
-
-if (CMAKE_INSTALL_LIBDIR)
-    SET(LIBRARY_DIRECTORY "${CMAKE_INSTALL_LIBDIR}")
-endif()
-
-if (CMAKE_INSTALL_INCLUDEDIR)
-    SET(INCLUDE_DIRECTORY "${CMAKE_INSTALL_INCLUDEDIR}")
-endif()
-
-if(BUILD_SHARED_LIBS)
-    SET(ARCHIVE_DIRECTORY "${BINARY_DIRECTORY}")
-else()
-    SET(ARCHIVE_DIRECTORY "${LIBRARY_DIRECTORY}")
-endif()
-
 add_sdks()
 
-# for user friendly sdk manager
-add_subdirectory(AWSSDK)

AWSSDK/CMakeLists.txt

@@ -455,8 +455,7 @@ You can use the AWSCredentialProvider interface to provide login credentials to
 The default credential provider chain does the following:
 * Checks your environment variables for AWS Credentials
 * Checks your $HOME/.aws/credentials file for a profile and credentials
-* Contacts the ECSCredentialsProvider service to request credentials
-* If ECSCredentialsProvider is not available then contacts the EC2MetadataInstanceProfile service to request credentials
+* Contacts the EC2MetadataInstanceProfile service to request credentials
 
 The simplest way to communicate with AWS is to ensure we can find your credentials in one of these locations.
 

CMakeLists.txt

@@ -9,9 +9,6 @@ file( GLOB TEXT_TO_SPEECH_HEADERS "include/aws/text-to-speech/*.h" )
 
 set(PLATFORM_LIBS "")
 
-# unset HAVE_PULSE to solve the warning "pulse not found" when pulse is installed after initial compile
-# this is because check_include_files tries to find HAVE_PULSE in CACHE after initial compile
-unset(HAVE_PULSE CACHE)
 check_include_files("pulse/simple.h" HAVE_PULSE)
 
 if(PLATFORM_WINDOWS)

README.md

@@ -13,7 +13,7 @@ function(compute_links lib)
     endif()
     # Immediately return if output property is already set.
     get_property(complete TARGET ${lib} PROPERTY LINK_LIBRARIES_ALL SET)
-    if(complete)
+    if(completed)
         return()
     endif()
     # Initialize output property.
@@ -89,4 +89,4 @@ function(sort_links targets_list)
     endwhile()
     # Directly append the only element in the current input list to the resulted variable.
     set(${targets_list} ${output_list} ${current_input_list} PARENT_SCOPE)
-endfunction(sort_links)
+endfunction(sort_links)