Skip to content

Commit

Permalink
Pulled latest crt, addresses libcrypto interface leaking and tests fr… (
Browse files Browse the repository at this point in the history
#89)

* Pulled latest crt, addresses libcrypto interface leaking and tests from crt-cpp eroniously being included in the build.

* Fix builds on windows when configuraiton is not specified.
  • Loading branch information
JonathanHenson committed Jan 29, 2020
1 parent de204d4 commit 1caa256
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,21 @@ string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${A
# Append that generated list to the module search path
list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})

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

if (BUILD_DEPS)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/aws-common-runtime/aws-crt-cpp/aws-common-runtime/aws-c-common/cmake")

include(AwsFindPackage)
set(IN_SOURCE_BUILD ON)
set(BUILD_TESTING_PREV BUILD_TESTING)
set(BUILD_TESTING_PREV ${BUILD_TESTING})
set(BUILD_TESTING OFF)
add_subdirectory(aws-common-runtime/aws-crt-cpp)

set(BUILD_TESTING BUILD_TESTING_PREV)
set(BUILD_TESTING ${BUILD_TESTING_PREV})
else()
include(AwsFindPackage)
set(IN_SOURCE_BUILD OFF)
Expand Down

0 comments on commit 1caa256

Please sign in to comment.