Skip to content

Commit

Permalink
CMake Improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@graebm
graebm committed Dec 23, 2024
1 parent bf9b2ea commit 1931fe5
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 43 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This library is licensed under the Apache 2.0 License.

- `dotnet build -f netstandard2.0 -p:PlatformTarget=x64 -p:CMakeConfig=Debug` for 64 bit mac machine. Check ./builder.json for `PlatformTarget` on your machine.
- `dotnet pack -p:TargetFrameworks=netstandard2.0`
- OR run `chmod a+x ./clean_rebuild.sh && ./clean_rebuild.sh`, which will clean up the previous build and rebuild the project from source.
- OR run `./clean_rebuild.sh`, which will clean up the previous build and rebuild the project from source.

### Test steps

Expand Down
2 changes: 1 addition & 1 deletion crt/aws-c-auth
Submodule aws-c-auth updated 3 files
+8 −0 .github/ISSUE_TEMPLATE/bug-report.yml
+32 −0 .github/workflows/issue-regression-labeler.yml
+8 −23 CMakeLists.txt
2 changes: 1 addition & 1 deletion crt/aws-c-cal
Submodule aws-c-cal updated 14 files
+8 −0 .github/ISSUE_TEMPLATE/bug-report.yml
+159 −74 .github/workflows/ci.yml
+32 −0 .github/workflows/issue-regression-labeler.yml
+9 −24 CMakeLists.txt
+0 −2 bin/produce_x_platform_fuzz_corpus/CMakeLists.txt
+0 −2 bin/run_x_platform_fuzz_corpus/CMakeLists.txt
+0 −2 bin/sha256_profile/CMakeLists.txt
+1 −0 include/aws/cal/rsa.h
+3 −0 source/darwin/securityframework_rsa.c
+2 −1 source/rsa.c
+9 −0 source/unix/openssl_rsa.c
+9 −2 source/windows/bcrypt_rsa.c
+3 −0 tests/CMakeLists.txt
+119 −1 tests/rsa_test.c
2 changes: 1 addition & 1 deletion crt/aws-c-common
Submodule aws-c-common updated 23 files
+8 −0 .github/ISSUE_TEMPLATE/bug-report.yml
+144 −58 .github/workflows/ci.yml
+1 −1 .github/workflows/clang-tidy.yml
+12 −6 .github/workflows/codecov.yml
+32 −0 .github/workflows/issue-regression-labeler.yml
+4 −4 .github/workflows/proof_ci_resources/config.yaml
+1 −1 AWSCRTAndroidTestRunner/app/src/main/cpp/CMakeLists.txt
+7 −10 CMakeLists.txt
+0 −2 bin/system_info/CMakeLists.txt
+5 −1 cmake/AwsCFlags.cmake
+80 −7 cmake/AwsPrebuildDependency.cmake
+6 −20 cmake/AwsSharedLibSetup.cmake
+1 −1 cmake/CPackConfig.cmake
+3 −0 cmake/aws-c-common-config.cmake
+2 −2 include/aws/common/cbor.h
+1 −0 include/aws/common/private/xml_parser_impl.h
+1 −7 include/aws/common/ref_count.h
+34 −0 include/aws/common/shutdown_types.h
+23 −17 source/common.c
+10 −0 source/xml_parser.c
+1 −0 tests/CMakeLists.txt
+55 −15 tests/hash_table_test.c
+36 −0 tests/xml_parser_test.c
2 changes: 1 addition & 1 deletion crt/aws-c-compression
Submodule aws-c-compression updated 6 files
+8 −0 .github/ISSUE_TEMPLATE/bug-report.yml
+76 −26 .github/workflows/ci.yml
+32 −0 .github/workflows/issue-regression-labeler.yml
+9 −23 CMakeLists.txt
+1 −1 source/huffman_generator/CMakeLists.txt
+2 −3 source/huffman_generator/generator.c
2 changes: 1 addition & 1 deletion crt/aws-c-http
Submodule aws-c-http updated 9 files
+8 −0 .github/ISSUE_TEMPLATE/bug-report.yml
+134 −51 .github/workflows/ci.yml
+32 −0 .github/workflows/issue-regression-labeler.yml
+8 −22 CMakeLists.txt
+1 −3 bin/elasticurl/CMakeLists.txt
+1 −1 builder.json
+8 −5 include/aws/http/private/hpack.h
+1 −3 tests/test_connection.c
+5 −10 tests/test_connection_manager.c
2 changes: 1 addition & 1 deletion crt/aws-c-io
Submodule aws-c-io updated 37 files
+8 −0 .github/ISSUE_TEMPLATE/bug-report.yml
+162 −71 .github/workflows/ci.yml
+32 −0 .github/workflows/issue-regression-labeler.yml
+3 −3 .github/workflows/proof-alarm.yml
+9 −24 CMakeLists.txt
+85 −326 include/aws/io/event_loop.h
+299 −0 include/aws/io/private/event_loop_impl.h
+22 −4 include/aws/io/retry_strategy.h
+5 −5 include/aws/io/tls_channel_handler.h
+32 −29 include/aws/testing/io_testing_channel.h
+2 −2 source/bsd/kqueue_event_loop.c
+1 −0 source/channel.c
+84 −80 source/event_loop.c
+3 −2 source/exponential_backoff_retry_strategy.c
+3 −4 source/linux/epoll_event_loop.c
+85 −0 source/no_retry_strategy.c
+1 −0 source/posix/pipe.c
+1 −0 source/posix/socket.c
+11 −7 source/s2n/s2n_tls_channel_handler.c
+1 −0 source/windows/iocp/iocp_event_loop.c
+1 −0 source/windows/iocp/pipe.c
+1 −0 source/windows/iocp/socket.c
+1 −0 tests/CMakeLists.txt
+1 −0 tests/alpn_handler_test.c
+5 −1 tests/byo_crypto_test.c
+5 −1 tests/channel_test.c
+48 −12 tests/default_host_resolver_test.c
+22 −9 tests/event_loop_test.c
+20 −5 tests/exponential_backoff_retry_test.c
+1 −0 tests/future_test.c
+27 −0 tests/no_retry_strategy_test.c
+1 −0 tests/pipe_test.c
+4 −2 tests/pkcs11_test.c
+12 −3 tests/socket_handler_test.c
+13 −3 tests/socket_test.c
+7 −1 tests/standard_retry_test.c
+15 −4 tests/tls_handler_test.c
2 changes: 1 addition & 1 deletion crt/aws-c-sdkutils
Submodule aws-c-sdkutils updated 7 files
+8 −0 .github/ISSUE_TEMPLATE/bug-report.yml
+80 −30 .github/workflows/ci.yml
+18 −12 .github/workflows/codecov.yml
+32 −0 .github/workflows/issue-regression-labeler.yml
+9 −24 CMakeLists.txt
+1 −1 include/aws/sdkutils/private/endpoints_util.h
+2 −2 tests/endpoints_regex_tests.c
2 changes: 1 addition & 1 deletion crt/aws-checksums
Submodule aws-checksums updated 12 files
+8 −0 .github/ISSUE_TEMPLATE/bug-report.yml
+177 −74 .github/workflows/ci.yml
+32 −0 .github/workflows/issue-regression-labeler.yml
+8 −22 CMakeLists.txt
+1 −3 bin/benchmark/CMakeLists.txt
+11 −1 builder.json
+0 −53 cmake/AwsSharedLibSetup.cmake
+41 −0 include/aws/checksums/private/crc_util.h
+576 −12 source/crc64_sw.c
+8 −7 source/crc_sw.c
+4 −1 tests/crc64_test.c
+3 −2 tests/crc_test.c
2 changes: 1 addition & 1 deletion crt/aws-lc
Submodule aws-lc updated from 8ffe27 to 1be42a
2 changes: 1 addition & 1 deletion crt/s2n
Submodule s2n updated from ffe0bf to 493b77
36 changes: 4 additions & 32 deletions native/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,12 @@
cmake_minimum_required(VERSION 3.9)
cmake_minimum_required(VERSION 3.9...3.31)

project(aws-crt-dotnet C)
option(BUILD_DEPS "Builds aws common runtime dependencies as part of build" ON)

if (POLICY CMP0077)
cmake_policy(SET CMP0077 NEW) # Enable options to get their values from normal variables
endif()

if (DEFINED CMAKE_PREFIX_PATH)
file(TO_CMAKE_PATH ${CMAKE_PREFIX_PATH} CMAKE_PREFIX_PATH)
endif()

if (DEFINED CMAKE_INSTALL_PREFIX)
file(TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX} CMAKE_INSTALL_PREFIX)
endif()


if (UNIX AND NOT APPLE)
include(GNUInstallDirs)
elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
set(CMAKE_INSTALL_LIBDIR "lib")
endif()

list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")

if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
set(FIND_LIBRARY_USE_LIB64_PATHS true)
endif()

if (NOT WIN32 AND NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "RelWithDebInfo")
endif()

# This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
# Append that generated list to the module search path
list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})

if (BUILD_DEPS)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../crt/aws-c-common/cmake")
message(STATUS "CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}")
Expand Down Expand Up @@ -85,6 +54,9 @@ if (BUILD_DEPS)
add_subdirectory(../crt/aws-c-auth ${CMAKE_BINARY_DIR}/deps/aws-c-auth)
add_subdirectory(../crt/aws-checksums ${CMAKE_BINARY_DIR}/deps/aws-checksums)
else()
# this is required so we can use aws-c-common's CMake modules
find_package(aws-c-common REQUIRED)

include(AwsFindPackage)
set(IN_SOURCE_BUILD OFF)
endif()
Expand Down

0 comments on commit 1931fe5

Please sign in to comment.