Skip to content

Commit 644dead

Browse files
JonathanHensonJonathanHenson
authored
Update mqtt version (aws#83)
* Updated deps to latest, improved cmake module searching and libdir * Incremented version number.
1 parent f58eefb commit 644dead

10 files changed

+57
-20
lines changed

‎CMakeLists.txt

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ cmake_minimum_required(VERSION 3.1)
22

33
option(BUILD_DEPS "Builds aws common runtime dependencies as part of build, only do this if you don't want to control your dependency chain." OFF)
44

5+
if (DEFINED CMAKE_PREFIX_PATH)
6+
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
7+
endif()
8+
9+
if (DEFINED CMAKE_INSTALL_PREFIX)
10+
file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX)
11+
endif()
12+
513
if (UNIX AND NOT APPLE)
614
include(GNUInstallDirs)
715
elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
@@ -20,7 +28,7 @@ if (NOT CMAKE_BUILD_TYPE)
2028
set(CMAKE_BUILD_TYPE "RelWithDebInfo")
2129
endif()
2230

23-
set(AWS_CRT_CPP_VERSION "v0.6.5")
31+
set(AWS_CRT_CPP_VERSION "v0.6.8")
2432

2533
configure_file(include/aws/crt/Config.h.in ${CMAKE_CURRENT_LIST_DIR}/include/aws/crt/Config.h @ONLY)
2634

@@ -53,7 +61,8 @@ if (BUILD_DEPS)
5361
-DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
5462
-DGIT_EXECUTABLE=${GIT_EXECUTABLE}
5563
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
56-
${CMAKE_CURRENT_SOURCE_DIR}/aws-common-runtime
64+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
65+
${CMAKE_CURRENT_SOURCE_DIR}/aws-common-runtime
5766
WORKING_DIRECTORY ${AWS_DEPS_BUILD_DIR}
5867
)
5968

@@ -69,6 +78,7 @@ if (BUILD_DEPS)
6978
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
7079
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/bin
7180
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
81+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
7282
${CMAKE_CURRENT_SOURCE_DIR}/aws-common-runtime
7383
WORKING_DIRECTORY ${AWS_DEPS_BUILD_DIR}
7484
RESULT_VARIABLE BUILD_AWSCRT_EXIT_CODE
@@ -98,7 +108,12 @@ else()
98108
project(aws-crt-cpp)
99109

100110
endif()
101-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
111+
112+
# This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
113+
set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
114+
string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
115+
# Append that generated list to the module search path
116+
list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
102117

103118
include(AwsCFlags)
104119
include(AwsSharedLibSetup)

‎aws-common-runtime/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project(aws-crt)
44
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
55

66
if(NOT CMAKE_BUILD_TYPE)
7-
set(CMAKE_BUILD_TYPE Release)
7+
set(CMAKE_BUILD_TYPE RelWithDebInfo)
88
endif()
99

1010
include(ExternalProject)
@@ -17,7 +17,7 @@ set(AWS_DEPS_DOWNLOAD_DIR "${AWS_DEPS_BUILD_DIR}/downloads" CACHE PATH "Dependen
1717

1818
message("install dir ${AWS_DEPS_INSTALL_DIR}")
1919
set(AWS_C_COMMON_URL "https://github.com/awslabs/aws-c-common.git")
20-
set(AWS_C_COMMON_SHA "v0.4.22")
20+
set(AWS_C_COMMON_SHA "v0.4.23")
2121
include(BuildAwsCCommon)
2222

2323
if (UNIX AND NOT APPLE)
@@ -27,7 +27,7 @@ if (UNIX AND NOT APPLE)
2727
endif()
2828

2929
set(AWS_C_IO_URL "https://github.com/awslabs/aws-c-io.git")
30-
set(AWS_C_IO_SHA "v0.4.17")
30+
set(AWS_C_IO_SHA "v0.4.18")
3131
include(BuildAwsCIO)
3232

3333
set(AWS_C_COMPRESSION_URL "https://github.com/awslabs/aws-c-compression.git")
@@ -39,7 +39,7 @@ set(AWS_C_HTTP_SHA "v0.4.17")
3939
include(BuildAwsCHttp)
4040

4141
set(AWS_C_MQTT_URL "https://github.com/awslabs/aws-c-mqtt.git")
42-
set(AWS_C_MQTT_SHA "v0.4.17")
42+
set(AWS_C_MQTT_SHA "v0.4.18")
4343
include(BuildAwsCMqtt)
4444

4545
set(AWS_C_CAL_URL "https://github.com/awslabs/aws-c-cal.git")

‎aws-common-runtime/cmake/BuildAwsCAuth.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ if("${TARGET_ARCH}" STREQUAL ANDROID)
1818
-DANDROID_STL=${ANDROID_STL}
1919
-DENABLE_HW_OPTIMIZATION=OFF
2020
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
21-
)
21+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
22+
)
2223
elseif(MSVC)
2324
ExternalProject_Add(AwsCAuth
2425
PREFIX ${AWS_DEPS_BUILD_DIR}
@@ -34,6 +35,7 @@ elseif(MSVC)
3435
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
3536
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
3637
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
38+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
3739
)
3840
else()
3941
ExternalProject_Add(AwsCAuth
@@ -49,5 +51,7 @@ else()
4951
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
5052
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
5153
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
52-
)
54+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
55+
)
5356
endif()
57+

‎aws-common-runtime/cmake/BuildAwsCCal.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ if("${TARGET_ARCH}" STREQUAL ANDROID)
1818
-DANDROID_STL=${ANDROID_STL}
1919
-DENABLE_HW_OPTIMIZATION=OFF
2020
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
21-
)
21+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
22+
)
2223
elseif(MSVC)
2324
ExternalProject_Add(AwsCCal
2425
PREFIX ${AWS_DEPS_BUILD_DIR}
@@ -34,7 +35,8 @@ elseif(MSVC)
3435
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
3536
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
3637
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
37-
)
38+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
39+
)
3840
else()
3941
ExternalProject_Add(AwsCCal
4042
PREFIX ${AWS_DEPS_BUILD_DIR}
@@ -49,5 +51,6 @@ else()
4951
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
5052
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
5153
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
54+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
5255
)
5356
endif()

‎aws-common-runtime/cmake/BuildAwsCCommon.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ if("${TARGET_ARCH}" STREQUAL ANDROID)
1919
-DANDROID_STL=${ANDROID_STL}
2020
-DENABLE_HW_OPTIMIZATION=OFF
2121
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
22-
)
22+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
23+
)
2324
elseif(MSVC)
2425
ExternalProject_Add(AwsCCommon
2526
PREFIX ${AWS_DEPS_BUILD_DIR}
@@ -36,6 +37,7 @@ elseif(MSVC)
3637
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
3738
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
3839
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
40+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
3941
)
4042
else()
4143
ExternalProject_Add(AwsCCommon
@@ -52,5 +54,6 @@ else()
5254
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
5355
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
5456
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
57+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
5558
)
5659
endif()

‎aws-common-runtime/cmake/BuildAwsCCompression.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ if("${TARGET_ARCH}" STREQUAL ANDROID)
1818
-DANDROID_STL=${ANDROID_STL}
1919
-DENABLE_HW_OPTIMIZATION=OFF
2020
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
21-
)
21+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
22+
)
2223
elseif(MSVC)
2324
ExternalProject_Add(AwsCCompression
2425
PREFIX ${AWS_DEPS_BUILD_DIR}
@@ -34,6 +35,7 @@ elseif(MSVC)
3435
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
3536
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
3637
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
38+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
3739
)
3840
else()
3941
ExternalProject_Add(AwsCCompression
@@ -49,5 +51,6 @@ else()
4951
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
5052
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
5153
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
54+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
5255
)
53-
endif()
56+
endif()

‎aws-common-runtime/cmake/BuildAwsCHttp.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ if("${TARGET_ARCH}" STREQUAL ANDROID)
1818
-DANDROID_STL=${ANDROID_STL}
1919
-DENABLE_HW_OPTIMIZATION=OFF
2020
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
21-
)
21+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
22+
)
2223
elseif(MSVC)
2324
ExternalProject_Add(AwsCHttp
2425
PREFIX ${AWS_DEPS_BUILD_DIR}
@@ -34,6 +35,7 @@ elseif(MSVC)
3435
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
3536
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
3637
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
38+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
3739
)
3840
else()
3941
ExternalProject_Add(AwsCHttp
@@ -49,5 +51,6 @@ else()
4951
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
5052
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
5153
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
54+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
5255
)
5356
endif()

‎aws-common-runtime/cmake/BuildAwsCIO.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ if("${TARGET_ARCH}" STREQUAL ANDROID)
1919
-DANDROID_STL=${ANDROID_STL}
2020
-DENABLE_HW_OPTIMIZATION=OFF
2121
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
22-
)
22+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
23+
)
2324
elseif(MSVC)
2425
ExternalProject_Add(AwsCIO
2526
PREFIX ${AWS_DEPS_BUILD_DIR}
@@ -36,6 +37,7 @@ elseif(MSVC)
3637
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
3738
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
3839
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
40+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
3941
)
4042
else()
4143
ExternalProject_Add(AwsCIO
@@ -52,5 +54,6 @@ else()
5254
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
5355
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
5456
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
57+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
5558
)
5659
endif()

‎aws-common-runtime/cmake/BuildAwsCMqtt.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ if("${TARGET_ARCH}" STREQUAL ANDROID)
1818
-DANDROID_STL=${ANDROID_STL}
1919
-DENABLE_HW_OPTIMIZATION=OFF
2020
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
21-
)
21+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
22+
)
2223
elseif(MSVC)
2324
ExternalProject_Add(AwsCMqtt
2425
PREFIX ${AWS_DEPS_BUILD_DIR}
@@ -34,6 +35,7 @@ elseif(MSVC)
3435
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
3536
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
3637
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
38+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
3739
)
3840
else()
3941
ExternalProject_Add(AwsCMqtt
@@ -49,5 +51,6 @@ else()
4951
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
5052
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
5153
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
54+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
5255
)
5356
endif()

‎aws-common-runtime/cmake/BuildS2N.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ if("${TARGET_ARCH}" STREQUAL ANDROID)
2121
-DANDROID_STL=${ANDROID_STL}
2222
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
2323
-DBUILD_TESTING=OFF
24-
-DUSE_S2N_PQ_CRYPTO=OFF
25-
)
24+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
25+
)
2626
else()
2727
ExternalProject_Add(S2N
2828
PREFIX ${AWS_DEPS_BUILD_DIR}
@@ -39,6 +39,6 @@ else()
3939
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
4040
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
4141
-DBUILD_TESTING=OFF
42-
-DUSE_S2N_PQ_CRYPTO=OFF
42+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
4343
)
4444
endif()

0 commit comments

Comments
 (0)