Skip to content

Commit 1caa256

Browse files
Pulled latest crt, addresses libcrypto interface leaking and tests fr… (#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.
1 parent de204d4 commit 1caa256

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

CMakeLists.txt

+6-5
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,21 @@ string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${A
3434
# Append that generated list to the module search path
3535
list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
3636

37-
if (NOT CMAKE_BUILD_TYPE)
38-
set(CMAKE_BUILD_TYPE "RelWithDebInfo")
37+
if (NOT DEFINED CMAKE_BUILD_TYPE)
38+
if (NOT WIN32)
39+
set(CMAKE_BUILD_TYPE "RelWithDebInfo")
40+
endif()
3941
endif()
4042

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

4446
include(AwsFindPackage)
4547
set(IN_SOURCE_BUILD ON)
46-
set(BUILD_TESTING_PREV BUILD_TESTING)
48+
set(BUILD_TESTING_PREV ${BUILD_TESTING})
4749
set(BUILD_TESTING OFF)
4850
add_subdirectory(aws-common-runtime/aws-crt-cpp)
49-
50-
set(BUILD_TESTING BUILD_TESTING_PREV)
51+
set(BUILD_TESTING ${BUILD_TESTING_PREV})
5152
else()
5253
include(AwsFindPackage)
5354
set(IN_SOURCE_BUILD OFF)

0 commit comments

Comments
 (0)