Skip to content

Allow building EC2 API in linux #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2016
+4 −1
Merged

Allow building EC2 API in linux #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,9 @@ add_definitions(-DJSON_USE_EXCEPTION=0)
if(NOT PLATFORM_WINDOWS AND NOT PLATFORM_DURANGO)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
if(NOT BUILD_SHARED_LIBS)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
endif()
endif()

# warning control
Expand Down Expand Up @@ -1106,7 +1109,7 @@ if(OUTPUT_VAR GREATER -1)
endif()

# trying to compile EC2Client.cpp hangs linux/android, may need some kind of custom build settings to handle it
if(NOT PLATFORM_LINUX AND NOT PLATFORM_ANDROID)
if(NOT PLATFORM_ANDROID)
LIST(FIND BUILD_ONLY "aws-cpp-sdk-ec2" OUTPUT_VAR)
if(OUTPUT_VAR GREATER -1)
add_subdirectory(aws-cpp-sdk-ec2)
Expand Down