Remove LIBTYPE in cmake.

add_library() will create shared libraries if BUILD_SHARED_LIBS is ON.
aws · May 9, 2019 · 7e7a92e · 7e7a92e
1 parent fe2be03
commit 7e7a92e
Show file tree

Hide file tree

Showing 27 changed files with 26 additions and 31 deletions.
diff --git a/android-unified-tests/CMakeLists.txt b/android-unified-tests/CMakeLists.txt
@@ -81,10 +81,9 @@ else()
 endif()
 
 
-SET(LIBTYPE SHARED)
 SET(SUFFIX so)
 
-add_library(android-unified-tests ${LIBTYPE} ${AWS_UNIFIED_INTEGRATION_TESTS_SRC})
+add_library(android-unified-tests ${AWS_UNIFIED_INTEGRATION_TESTS_SRC})
 
 set_compiler_flags(${PROJECT_NAME})
 set_compiler_warnings(${PROJECT_NAME})

diff --git a/aws-cpp-sdk-access-management/CMakeLists.txt b/aws-cpp-sdk-access-management/CMakeLists.txt
@@ -33,7 +33,7 @@ if(USE_WINDOWS_DLL_SEMANTICS AND BUILD_SHARED_LIBS)
     add_definitions("-DAWS_ACCESS_MANAGEMENT_EXPORTS")
 endif()
 
-add_library(${PROJECT_NAME} ${LIBTYPE} ${ACCESS_MANAGEMENT_SRC})
+add_library(${PROJECT_NAME} ${ACCESS_MANAGEMENT_SRC})
 add_library(AWS::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 set_compiler_flags(${PROJECT_NAME})

diff --git a/aws-cpp-sdk-cloudfront-integration-tests/CMakeLists.txt b/aws-cpp-sdk-cloudfront-integration-tests/CMakeLists.txt
@@ -30,7 +30,7 @@ endif()
 enable_testing()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_CLOUDFRONT_INTEGRATION_TESTS_SRC})
+    add_library(${PROJECT_NAME} ${AWS_CLOUDFRONT_INTEGRATION_TESTS_SRC})
 else()
     add_executable(${PROJECT_NAME} ${AWS_CLOUDFRONT_INTEGRATION_TESTS_SRC})
 endif()

diff --git a/aws-cpp-sdk-cognitoidentity-integration-tests/CMakeLists.txt b/aws-cpp-sdk-cognitoidentity-integration-tests/CMakeLists.txt
@@ -25,7 +25,7 @@ endif()
 enable_testing()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_COGNITO_INTEGRATION_TESTS_SRC})
+    add_library(${PROJECT_NAME} ${AWS_COGNITO_INTEGRATION_TESTS_SRC})
 else()
     add_executable(${PROJECT_NAME} ${AWS_COGNITO_INTEGRATION_TESTS_SRC})
 endif()

diff --git a/aws-cpp-sdk-core-tests/CMakeLists.txt b/aws-cpp-sdk-core-tests/CMakeLists.txt
@@ -87,7 +87,7 @@ if(USE_WINDOWS_DLL_SEMANTICS AND BUILD_SHARED_LIBS)
 endif()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_CPP_SDK_CORE_TESTS_SRC})
+    add_library(${PROJECT_NAME} ${AWS_CPP_SDK_CORE_TESTS_SRC})
 else()
     add_executable(${PROJECT_NAME} ${AWS_CPP_SDK_CORE_TESTS_SRC})
 endif()

diff --git a/aws-cpp-sdk-core/CMakeLists.txt b/aws-cpp-sdk-core/CMakeLists.txt
@@ -404,7 +404,7 @@ if(MSVC)
 
 endif(MSVC)
 
-add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_NATIVE_SDK_SRC})
+add_library(${PROJECT_NAME} ${AWS_NATIVE_SDK_SRC})
 add_library(AWS::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC "AWS_SDK_VERSION_MAJOR=${AWSSDK_VERSION_MAJOR}")

diff --git a/aws-cpp-sdk-dynamodb-integration-tests/CMakeLists.txt b/aws-cpp-sdk-dynamodb-integration-tests/CMakeLists.txt
@@ -17,7 +17,7 @@ endif()
 enable_testing()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_DYNAMO_INTEGRATION_TESTS_SRC})
+    add_library(${PROJECT_NAME} ${AWS_DYNAMO_INTEGRATION_TESTS_SRC})
 else()
     add_executable(${PROJECT_NAME} ${AWS_DYNAMO_INTEGRATION_TESTS_SRC})
 endif()

diff --git a/aws-cpp-sdk-ec2-integration-tests/CMakeLists.txt b/aws-cpp-sdk-ec2-integration-tests/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
 enable_testing()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_EC2_INTEGRATION_TESTS_SRC})
+    add_library(${PROJECT_NAME} ${AWS_EC2_INTEGRATION_TESTS_SRC})
 else()
     add_executable(${PROJECT_NAME} ${AWS_EC2_INTEGRATION_TESTS_SRC})
 endif()

diff --git a/aws-cpp-sdk-identity-management-tests/CMakeLists.txt b/aws-cpp-sdk-identity-management-tests/CMakeLists.txt
@@ -34,7 +34,7 @@ if(PLATFORM_WINDOWS AND MSVC AND BUILD_SHARED_LIBS)
 endif()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_CPP_SDK_IDENTITY_MANAGEMENT_TESTS_SRC})
+    add_library(${PROJECT_NAME} ${AWS_CPP_SDK_IDENTITY_MANAGEMENT_TESTS_SRC})
 else()
     add_executable(${PROJECT_NAME} ${AWS_CPP_SDK_IDENTITY_MANAGEMENT_TESTS_SRC})
 endif()

diff --git a/aws-cpp-sdk-identity-management/CMakeLists.txt b/aws-cpp-sdk-identity-management/CMakeLists.txt
@@ -38,7 +38,7 @@ if(USE_WINDOWS_DLL_SEMANTICS AND BUILD_SHARED_LIBS)
     add_definitions("-DAWS_IDENTITY_MANAGEMENT_EXPORTS")
 endif()
 
-add_library(${PROJECT_NAME} ${LIBTYPE} ${IDENTITY_MGMT_SRC})
+add_library(${PROJECT_NAME} ${IDENTITY_MGMT_SRC})
 add_library(AWS::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 set_compiler_flags(${PROJECT_NAME})

diff --git a/aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt b/aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt
@@ -34,7 +34,7 @@ endif()
 enable_testing()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_LAMBDA_INTEGRATION_TESTS_SRC})
+    add_library(${PROJECT_NAME} ${AWS_LAMBDA_INTEGRATION_TESTS_SRC})
 else()
     add_executable(${PROJECT_NAME} ${AWS_LAMBDA_INTEGRATION_TESTS_SRC})
 endif()

diff --git a/aws-cpp-sdk-queues/CMakeLists.txt b/aws-cpp-sdk-queues/CMakeLists.txt
@@ -38,7 +38,7 @@ if(USE_WINDOWS_DLL_SEMANTICS AND BUILD_SHARED_LIBS)
     add_definitions("-DAWS_QUEUES_EXPORTS")
 endif()
 
-add_library(${PROJECT_NAME} ${LIBTYPE} ${QUEUES_SRC})
+add_library(${PROJECT_NAME} ${QUEUES_SRC})
 add_library(AWS::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 set_compiler_flags(${PROJECT_NAME})

diff --git a/aws-cpp-sdk-redshift-integration-tests/CMakeLists.txt b/aws-cpp-sdk-redshift-integration-tests/CMakeLists.txt
@@ -22,7 +22,7 @@ endif()
 enable_testing()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_REDSHIFT_INTEGRATION_TESTS_SRC})
+    add_library(${PROJECT_NAME} ${AWS_REDSHIFT_INTEGRATION_TESTS_SRC})
 else()
     add_executable(${PROJECT_NAME} ${AWS_REDSHIFT_INTEGRATION_TESTS_SRC})
 endif()

diff --git a/aws-cpp-sdk-s3-encryption-integration-tests/CMakeLists.txt b/aws-cpp-sdk-s3-encryption-integration-tests/CMakeLists.txt
@@ -30,7 +30,7 @@ endif()
 enable_testing()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(aws-cpp-sdk-s3-encryption-integration-tests ${LIBTYPE} ${S3ENCRYPTION_INT_TEST_SRC})
+    add_library(aws-cpp-sdk-s3-encryption-integration-tests ${S3ENCRYPTION_INT_TEST_SRC})
 else()
     add_executable(aws-cpp-sdk-s3-encryption-integration-tests ${S3ENCRYPTION_INT_TEST_SRC})
 endif()

diff --git a/aws-cpp-sdk-s3-encryption-tests/CMakeLists.txt b/aws-cpp-sdk-s3-encryption-tests/CMakeLists.txt
@@ -36,7 +36,7 @@ if (AUTORUN_UNIT_TESTS)
 endif()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(aws-cpp-sdk-s3-encryption-tests ${LIBTYPE} ${S3ENCRYPTION_TEST_SRC})
+    add_library(aws-cpp-sdk-s3-encryption-tests ${S3ENCRYPTION_TEST_SRC})
 else()
     add_executable(aws-cpp-sdk-s3-encryption-tests ${S3ENCRYPTION_TEST_SRC})
 endif()

diff --git a/aws-cpp-sdk-s3-encryption/CMakeLists.txt b/aws-cpp-sdk-s3-encryption/CMakeLists.txt
@@ -59,7 +59,7 @@ if(USE_WINDOWS_DLL_SEMANTICS AND BUILD_SHARED_LIBS)
     add_definitions("-DAWS_S3ENCRYPTION_EXPORTS")
 endif()
 
-add_library(${PROJECT_NAME} ${LIBTYPE} ${ALL_S3ENCRYPTION})
+add_library(${PROJECT_NAME} ${ALL_S3ENCRYPTION})
 add_library(AWS::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 set_compiler_flags(${PROJECT_NAME})

diff --git a/aws-cpp-sdk-s3-integration-tests/CMakeLists.txt b/aws-cpp-sdk-s3-integration-tests/CMakeLists.txt
@@ -21,7 +21,7 @@ endif()
 enable_testing()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_S3_INTEGRATION_TESTS_SRC})
+    add_library(${PROJECT_NAME} ${AWS_S3_INTEGRATION_TESTS_SRC})
 else()
     add_executable(${PROJECT_NAME} ${AWS_S3_INTEGRATION_TESTS_SRC})
 endif()

diff --git a/aws-cpp-sdk-s3control-integration-tests/CMakeLists.txt b/aws-cpp-sdk-s3control-integration-tests/CMakeLists.txt
@@ -18,7 +18,7 @@ file(GLOB AWS_S3_CONTROL_INTEGRATION_TESTS_SRC
 enable_testing()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_S3_CONTROL_INTEGRATION_TESTS_SRC})
+    add_library(${PROJECT_NAME} ${AWS_S3_CONTROL_INTEGRATION_TESTS_SRC})
 else()
     add_executable(${PROJECT_NAME} ${AWS_S3_CONTROL_INTEGRATION_TESTS_SRC})
 endif()

diff --git a/aws-cpp-sdk-sqs-integration-tests/CMakeLists.txt b/aws-cpp-sdk-sqs-integration-tests/CMakeLists.txt
@@ -22,7 +22,7 @@ endif()
 enable_testing()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_SQS_INTEGRATION_TESTS_SRC})
+    add_library(${PROJECT_NAME} ${AWS_SQS_INTEGRATION_TESTS_SRC})
 else()
     add_executable(${PROJECT_NAME} ${AWS_SQS_INTEGRATION_TESTS_SRC})
 endif()

diff --git a/aws-cpp-sdk-text-to-speech-tests/CMakeLists.txt b/aws-cpp-sdk-text-to-speech-tests/CMakeLists.txt
@@ -25,7 +25,7 @@ if (AUTORUN_UNIT_TESTS)
 endif()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${TEXT_TO_SPEECH_TEST_SRC})
+    add_library(${PROJECT_NAME} ${TEXT_TO_SPEECH_TEST_SRC})
 else()
     add_executable(${PROJECT_NAME} ${TEXT_TO_SPEECH_TEST_SRC})
 endif()

diff --git a/aws-cpp-sdk-text-to-speech/CMakeLists.txt b/aws-cpp-sdk-text-to-speech/CMakeLists.txt
@@ -107,7 +107,7 @@ if(USE_WINDOWS_DLL_SEMANTICS AND BUILD_SHARED_LIBS)
     add_definitions("-DAWS_TEXT_TO_SPEECH_EXPORTS")
 endif()
 
-add_library(${PROJECT_NAME} ${LIBTYPE} ${ALL_TEXT_TO_SPEECH})
+add_library(${PROJECT_NAME} ${ALL_TEXT_TO_SPEECH})
 add_library(AWS::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 set_compiler_flags(${PROJECT_NAME})

diff --git a/aws-cpp-sdk-transcribestreaming-integration-tests/CMakeLists.txt b/aws-cpp-sdk-transcribestreaming-integration-tests/CMakeLists.txt
@@ -15,7 +15,7 @@ endif()
 enable_testing()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_TRANSCRIBESTREAMING_INTEGRATION_TESTS_SRC})
+    add_library(${PROJECT_NAME} ${AWS_TRANSCRIBESTREAMING_INTEGRATION_TESTS_SRC})
 else()
     add_executable(${PROJECT_NAME} ${AWS_TRANSCRIBESTREAMING_INTEGRATION_TESTS_SRC})
 endif()

diff --git a/aws-cpp-sdk-transfer-tests/CMakeLists.txt b/aws-cpp-sdk-transfer-tests/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
 enable_testing()
 
 if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
-    add_library(${PROJECT_NAME} ${LIBTYPE} ${TRANSFER_TEST_SRC})
+    add_library(${PROJECT_NAME} ${TRANSFER_TEST_SRC})
 else()
     add_executable(${PROJECT_NAME} ${TRANSFER_TEST_SRC})
 endif()

diff --git a/aws-cpp-sdk-transfer/CMakeLists.txt b/aws-cpp-sdk-transfer/CMakeLists.txt
@@ -35,7 +35,7 @@ if(USE_WINDOWS_DLL_SEMANTICS AND BUILD_SHARED_LIBS)
     add_definitions("-DAWS_TRANSFER_EXPORTS")
 endif()
 
-add_library(${PROJECT_NAME} ${LIBTYPE} ${ALL_TRANSFER})
+add_library(${PROJECT_NAME} ${ALL_TRANSFER})
 add_library(AWS::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 target_include_directories(${PROJECT_NAME} PUBLIC

diff --git a/cmake/resolve_platform.cmake b/cmake/resolve_platform.cmake
@@ -39,11 +39,9 @@ set(LIBRARY_DIRECTORY "lib")
 set(INCLUDE_DIRECTORY "include")
 if(BUILD_SHARED_LIBS)
     set(ARCHIVE_DIRECTORY "bin")
-    set(LIBTYPE SHARED)
     message(STATUS "Building AWS libraries as shared objects")
 else()
     set(ARCHIVE_DIRECTORY "lib")
-    set(LIBTYPE STATIC)
     message(STATUS "Building AWS libraries as static objects")
 endif()
 

diff --git a/...erator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/CMakeFile.vm b/...erator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/CMakeFile.vm
@@ -14,11 +14,9 @@ set(LIBRARY_DIRECTORY "lib")
 set(INCLUDE_DIRECTORY "include")
 if(BUILD_SHARED_LIBS)
     set(ARCHIVE_DIRECTORY "bin")
-    set(LIBTYPE SHARED)
     message(STATUS "Building custom service as shared objects")
 else()
     set(ARCHIVE_DIRECTORY "lib")
-    set(LIBTYPE STATIC)
     message(STATUS "Building custom service as static objects")
 endif()
 
@@ -79,7 +77,7 @@ set(${projectNameCaps}_INCLUDES
     "${cmakeVarStart}CMAKE_CURRENT_SOURCE_DIR}/include/"
 )
 
-add_library(${PROJECT_NAME} ${cmakeVarStart}LIBTYPE} ${cmakeVarStart}${projectNameCaps}_SRC})
+add_library(${PROJECT_NAME} ${cmakeVarStart}${projectNameCaps}_SRC})
 add_library(AWS::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 set_compiler_flags(${PROJECT_NAME})

diff --git a/testing-resources/CMakeLists.txt b/testing-resources/CMakeLists.txt
@@ -101,7 +101,7 @@ if(PLATFORM_WINDOWS)
     add_definitions("-DDISABLE_HOME_DIR_REDIRECT")
 endif()
 
-add_library(${PROJECT_NAME} ${LIBTYPE} ${TestingResources_SRC})
+add_library(${PROJECT_NAME} ${TestingResources_SRC})
 add_library(AWS::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 set_compiler_flags(${PROJECT_NAME})