blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 01:40:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use aws-sdk-cpp submodule instead of from conan

Browse source
This commit is contained in:
Dan Paulat 2023-01-23 01:14:07 -06:00
parent 911226c166
commit 34de01e0de
8 changed files with 44 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -25,3 +25,6 @@
[submodule "external/imgui-backend-qt"] [submodule "external/imgui-backend-qt"]
path = external/imgui-backend-qt path = external/imgui-backend-qt
url = ../imgui-backend-qt url = ../imgui-backend-qt
[submodule "external/aws-sdk-cpp"]
path = external/aws-sdk-cpp
url = https://github.com/aws/aws-sdk-cpp.git

3
CMakeLists.txt
View file

@ -12,8 +12,7 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
include(${PROJECT_SOURCE_DIR}/external/cmake-conan/conan.cmake) include(${PROJECT_SOURCE_DIR}/external/cmake-conan/conan.cmake)
conan_cmake_configure(REQUIRES aws-sdk-cpp/1.9.234 conan_cmake_configure(REQUIRES boost/1.81.0
boost/1.81.0
cpr/1.9.3 cpr/1.9.3
freetype/2.12.1 freetype/2.12.1
geographiclib/1.52 geographiclib/1.52

2
external/CMakeLists.txt vendored
View file

@ -4,12 +4,14 @@ set(PROJECT_NAME scwx-external)
set_property(DIRECTORY set_property(DIRECTORY
APPEND APPEND
PROPERTY CMAKE_CONFIGURE_DEPENDS PROPERTY CMAKE_CONFIGURE_DEPENDS
aws-sdk-cpp.cmake
freetype-gl.cmake freetype-gl.cmake
hsluv-c.cmake hsluv-c.cmake
imgui.cmake imgui.cmake
mapbox-gl-native.cmake mapbox-gl-native.cmake
stb.cmake) stb.cmake)
include(aws-sdk-cpp.cmake)
include(freetype-gl.cmake) include(freetype-gl.cmake)
include(hsluv-c.cmake) include(hsluv-c.cmake)
include(imgui.cmake) include(imgui.cmake)

1
external/aws-sdk-cpp vendored Submodule

@ -0,0 +1 @@
Subproject commit e045a9e347ab8b8d0138f80831dbcb57820f3b0e

33
external/aws-sdk-cpp.cmake vendored Normal file
View file

@ -0,0 +1,33 @@
cmake_minimum_required(VERSION 3.20)
set(PROJECT_NAME scwx-aws-sdk-cpp)
set(BUILD_ONLY "s3")
set(BUILD_SHARED_LIBS OFF)
set(CPP_STANDARD 17)
set(ENABLE_TESTING OFF)
set(ENABLE_UNITY_BUILD ON)
set(MINIMIZE_SIZE OFF)
if(NOT CMAKE_EXE_LINKER_FLAGS_DEBUGOPT)
set(CMAKE_EXE_LINKER_FLAGS_DEBUGOPT "")
endif()
add_subdirectory(aws-sdk-cpp)
set_target_properties(uninstall PROPERTIES EXCLUDE_FROM_ALL True)
set_target_properties(aws-c-auth PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(aws-c-cal PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(aws-c-common PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(aws-c-compression PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(aws-c-event-stream PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(aws-checksums PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(aws-c-http PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(aws-c-io PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(aws-c-mqtt PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(aws-cpp-sdk-core PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(aws-cpp-sdk-s3 PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(aws-crt-cpp PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(aws-c-s3 PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(aws-c-sdkutils PROPERTIES FOLDER aws-sdk-cpp)
set_target_properties(uninstall PROPERTIES FOLDER aws-sdk-cpp/exclude)

2
setup-debug.bat
View file

@ -1,5 +1,5 @@
call tools\setup-common.bat call tools\setup-common.bat
mkdir build-debug mkdir build-debug
cd build-debug cd build-debug
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:\Qt\6.4.2\msvc2019_64 .. cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.4.2/msvc2019_64 ..
pause pause

2
setup-release.bat
View file

@ -1,5 +1,5 @@
call tools\setup-common.bat call tools\setup-common.bat
mkdir build-release mkdir build-release
cd build-release cd build-release
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:\Qt\6.4.2\msvc2019_64 .. cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.4.2/msvc2019_64 ..
pause pause

4
wxdata/wxdata.cmake
View file

@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.20)
project(scwx-data) project(scwx-data)
find_package(AWSSDK)
find_package(Boost) find_package(Boost)
find_package(cpr) find_package(cpr)
find_package(LibXml2) find_package(LibXml2)
@ -234,7 +233,8 @@ target_compile_options(wxdata PRIVATE
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror> $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
) )
target_link_libraries(wxdata PUBLIC AWS::s3 target_link_libraries(wxdata PUBLIC aws-cpp-sdk-core
aws-cpp-sdk-s3
cpr::cpr cpr::cpr
LibXml2::LibXml2 LibXml2::LibXml2
spdlog::spdlog) spdlog::spdlog)