Skip to content

Commit 53a8264

Browse files
tobodnermarcomagdy
authored andcommitted
Enable inclusion via CMake add_subdirectory
- When included in other projects as a git submodule, aws-lambda-cpp CMakeLists.txt's use of CMAKE_SOURCE_DIR prohibits convenient build inclusion via add_subdirectory. - This is because CMAKE_SOURCE_DIR always points to the top-level project's source directory, preventing, .e.g, find_package to work properly
1 parent 55276ce commit 53a8264

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
2020
VERSION ${PROJECT_VERSION})
2121

2222
target_include_directories(${PROJECT_NAME} PUBLIC
23-
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
23+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
2424
$<INSTALL_INTERFACE:include>)
2525

2626
check_ipo_supported(RESULT has_lto OUTPUT lto_check_output)
@@ -111,7 +111,7 @@ install(TARGETS ${PROJECT_NAME}
111111
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
112112
)
113113

114-
configure_file("${CMAKE_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake"
114+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake"
115115
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
116116
@ONLY)
117117

@@ -125,6 +125,6 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
125125
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
126126
DESTINATION "lib/${PROJECT_NAME}/cmake/")
127127

128-
install(PROGRAMS "${CMAKE_SOURCE_DIR}/packaging/packager"
128+
install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/packaging/packager"
129129
DESTINATION "lib/${PROJECT_NAME}/cmake/")
130130

0 commit comments

Comments
 (0)