Skip to content

Commit 2580200

Browse files
JonathanHensonJonathanHenson
authored
Added support for RHEL variant lib paths, general install improvements. (aws#5)
* Added support for RHEL variant lib paths, general install improvements.
1 parent 5246899 commit 2580200

File tree

4 files changed

+33
-15
lines changed

4 files changed

+33
-15
lines changed

‎CMakeLists.txt

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
88
set(CMAKE_INSTALL_LIBDIR "lib")
99
endif()
1010

11+
if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
12+
set(FIND_LIBRARY_USE_LIB64_PATHS true)
13+
endif()
14+
1115
if (BUILD_DEPS)
1216
set(AWS_DEPS_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/deps)
1317
if (DEFINED CMAKE_INSTALL_PREFIX)
@@ -16,12 +20,12 @@ if (BUILD_DEPS)
1620
set(AWS_DEPS_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/deps/install)
1721
endif()
1822

23+
list(APPEND CMAKE_MODULE_PATH "${AWS_DEPS_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake")
24+
1925
if (NOT DEFINED CMAKE_PREFIX_PATH)
2026
set(CMAKE_PREFIX_PATH ${AWS_DEPS_INSTALL_DIR})
2127
endif()
2228

23-
list(APPEND CMAKE_MODULE_PATH "${AWS_DEPS_INSTALL_DIR}/lib/cmake")
24-
2529
file(MAKE_DIRECTORY ${AWS_DEPS_BUILD_DIR})
2630
if(TARGET_ARCH STREQUAL "ANDROID")
2731
execute_process(
@@ -35,6 +39,7 @@ if (BUILD_DEPS)
3539
-DANDROID_STL=${ANDROID_STL}
3640
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
3741
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
42+
-DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
3843
-DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
3944
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
4045
-DGIT_EXECUTABLE=${GIT_EXECUTABLE}
@@ -50,6 +55,7 @@ if (BUILD_DEPS)
5055
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
5156
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
5257
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
58+
-DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
5359
-DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
5460
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
5561
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/bin
@@ -80,6 +86,7 @@ else()
8086
#the following two lines are done in this branch intentionally, don't move it. project() does some magic that
8187
#we want happening exactly right now.
8288
project(aws-crt-cpp CXX)
89+
8390
list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
8491
endif()
8592

@@ -106,7 +113,7 @@ file(GLOB AWS_CRT_EXTERNAL_HEADERS
106113

107114
file(GLOB AWS_CRT_CPP_HEADERS
108115
${AWS_CRT_HEADERS}
109-
${AWS_CRT_IO_HEADERS}
116+
${AWS_CRT_IO_HEADERS}
110117
${AWS_CRT_MQTT_HEADERS}
111118
)
112119

@@ -176,28 +183,31 @@ target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
176183
find_package(aws-c-mqtt REQUIRED)
177184
target_link_libraries(${CMAKE_PROJECT_NAME} AWS::aws-c-mqtt)
178185

179-
install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt")
180-
install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "include/aws/crt/io")
181-
install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt")
182-
install(FILES ${AWS_CRT_EXTERNAL_HEADERS} DESTINATION "include/aws/crt/external")
186+
install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development)
187+
install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "include/aws/crt/io" COMPONENT Development)
188+
install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt" COMPONENT Development)
189+
install(FILES ${AWS_CRT_EXTERNAL_HEADERS} DESTINATION "include/aws/crt/external" COMPONENT Development)
183190

184191
install(
185192
TARGETS ${CMAKE_PROJECT_NAME}
186193
EXPORT ${CMAKE_PROJECT_NAME}-targets
187-
ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
188-
LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
194+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
195+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
196+
RUNTIME DESTINATION bin COMPONENT Runtime
189197
)
190198

191199
install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
192-
DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_PROJECT_NAME}/cmake/"
193-
NAMESPACE AWS::)
200+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}/cmake/"
201+
NAMESPACE AWS::
202+
COMPONENT Development)
194203

195204
configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
196205
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
197206
@ONLY)
198207

199208
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
200-
DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_PROJECT_NAME}/cmake/")
209+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}/cmake/"
210+
COMPONENT Development)
201211

202212
enable_testing()
203213
add_subdirectory(tests)

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ if("${TARGET_ARCH}" STREQUAL ANDROID)
66
BUILD_IN_SOURCE 0
77
UPDATE_COMMAND ""
88
CMAKE_ARGS
9+
-DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
910
-DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
1011
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
1112
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
@@ -27,6 +28,7 @@ elseif(MSVC)
2728
BUILD_IN_SOURCE 0
2829
UPDATE_COMMAND ""
2930
CMAKE_ARGS
31+
-DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
3032
-DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
3133
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
3234
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
@@ -43,11 +45,12 @@ else()
4345
BUILD_IN_SOURCE 0
4446
UPDATE_COMMAND ""
4547
CMAKE_ARGS
48+
-DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
4649
-DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
4750
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
4851
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
4952
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
5053
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
5154
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
5255
)
53-
endif()
56+
endif()

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ if("${TARGET_ARCH}" STREQUAL ANDROID)
66
BUILD_IN_SOURCE 0
77
UPDATE_COMMAND ""
88
CMAKE_ARGS
9+
-DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
910
-DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
1011
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
1112
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
@@ -27,6 +28,7 @@ elseif(MSVC)
2728
BUILD_IN_SOURCE 0
2829
UPDATE_COMMAND ""
2930
CMAKE_ARGS
31+
-DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
3032
-DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
3133
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
3234
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
@@ -43,11 +45,12 @@ else()
4345
BUILD_IN_SOURCE 0
4446
UPDATE_COMMAND ""
4547
CMAKE_ARGS
48+
-DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
4649
-DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
4750
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
4851
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
4952
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
5053
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
5154
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
5255
)
53-
endif()
56+
endif()

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ if("${TARGET_ARCH}" STREQUAL ANDROID)
88
BUILD_IN_SOURCE 0
99
UPDATE_COMMAND ""
1010
CMAKE_ARGS
11+
-DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
1112
-DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
1213
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
1314
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
@@ -29,11 +30,12 @@ else()
2930
BUILD_IN_SOURCE 0
3031
UPDATE_COMMAND ""
3132
CMAKE_ARGS
33+
-DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
3234
-DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
3335
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
3436
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
3537
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
3638
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
3739
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
3840
)
39-
endif()
41+
endif()

0 commit comments

Comments
 (0)