Skip to content

Commit 73782be

Browse files
enabled in-source builds. (#172)
1 parent 386d741 commit 73782be

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

CMakeLists.txt

+18-17
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ include(AwsCFlags)
3131
include(AwsSharedLibSetup)
3232
include(AwsSanitizers)
3333
include(CheckCCompilerFlag)
34+
include(AwsFindPackage)
3435

3536
file(GLOB AWS_HTTP_HEADERS
3637
"include/aws/http/*.h"
@@ -53,24 +54,24 @@ file(GLOB HTTP_SRC
5354
${AWS_HTTP_SRC}
5455
)
5556

56-
add_library(${CMAKE_PROJECT_NAME} ${HTTP_HEADERS} ${HTTP_SRC})
57-
aws_set_common_properties(${CMAKE_PROJECT_NAME})
58-
aws_prepare_symbol_visibility_args(${CMAKE_PROJECT_NAME} "AWS_HTTP")
59-
aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
57+
add_library(${PROJECT_NAME} ${HTTP_HEADERS} ${HTTP_SRC})
58+
aws_set_common_properties(${PROJECT_NAME})
59+
aws_prepare_symbol_visibility_args(${PROJECT_NAME} "AWS_HTTP")
60+
aws_add_sanitizers(${PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
6061

6162
# We are not ABI stable yet
62-
set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0)
63-
set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
63+
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION 1.0.0)
64+
set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 0unstable)
6465

65-
target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
66+
target_include_directories(${PROJECT_NAME} PUBLIC
6667
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
6768
$<INSTALL_INTERFACE:include>)
6869

69-
find_package(aws-c-io REQUIRED)
70-
find_package(aws-c-compression REQUIRED)
71-
target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC AWS::aws-c-io AWS::aws-c-compression)
70+
aws_use_package(aws-c-io)
71+
aws_use_package(aws-c-compression)
72+
target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS})
7273

73-
aws_prepare_shared_lib_exports(${CMAKE_PROJECT_NAME})
74+
aws_prepare_shared_lib_exports(${PROJECT_NAME})
7475

7576
install(FILES ${AWS_HTTP_HEADERS} DESTINATION "include/aws/http")
7677

@@ -80,17 +81,17 @@ else()
8081
set (TARGET_DIR "static")
8182
endif()
8283

83-
install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
84-
DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
84+
install(EXPORT "${PROJECT_NAME}-targets"
85+
DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
8586
NAMESPACE AWS::
8687
COMPONENT Development)
8788

88-
configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
89-
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
89+
configure_file("cmake/${PROJECT_NAME}-config.cmake"
90+
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
9091
@ONLY)
9192

92-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
93-
DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
93+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
94+
DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
9495
COMPONENT Development)
9596

9697
include(CTest)

tests/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ if (ENABLE_PROXY_INTEGRATION_TESTS)
270270
add_test_case(test_https_proxy_connection_get)
271271
endif()
272272

273-
set(TEST_BINARY_NAME ${CMAKE_PROJECT_NAME}-tests)
273+
set(TEST_BINARY_NAME ${PROJECT_NAME}-tests)
274274
generate_test_driver(${TEST_BINARY_NAME})
275275

276276
file(GLOB FUZZ_TESTS "fuzz/*.c")

0 commit comments

Comments
 (0)