Skip to content

Support building under /build/ directories #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
travisb-nexthop wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −22
Draft

Support building under /build/ directories #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions wangle/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,17 +148,19 @@ install(
# =============================================================================

# Collect all headers via recursive glob (like folly/fizz does)
file(GLOB_RECURSE WANGLE_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
file(GLOB_RECURSE WANGLE_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"${CMAKE_CURRENT_SOURCE_DIR}/*.h")
# Filter out test, facebook, and other non-public directories
list(FILTER WANGLE_HEADERS EXCLUDE REGEX "/test/")
list(FILTER WANGLE_HEADERS EXCLUDE REGEX "/facebook/")
list(FILTER WANGLE_HEADERS EXCLUDE REGEX "/build/")
list(FILTER WANGLE_HEADERS EXCLUDE REGEX "/example/")
list(FILTER WANGLE_HEADERS EXCLUDE REGEX "(^|/)test/")
list(FILTER WANGLE_HEADERS EXCLUDE REGEX "(^|/)facebook/")
list(FILTER WANGLE_HEADERS EXCLUDE REGEX "(^|/)build/")
list(FILTER WANGLE_HEADERS EXCLUDE REGEX "(^|/)example/")

# Collect test headers separately
file(GLOB_RECURSE WANGLE_TEST_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
list(FILTER WANGLE_TEST_HEADERS INCLUDE REGEX "/test/")
list(FILTER WANGLE_TEST_HEADERS EXCLUDE REGEX "/facebook/")
file(GLOB_RECURSE WANGLE_TEST_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
"${CMAKE_CURRENT_SOURCE_DIR}/*.h")
list(FILTER WANGLE_TEST_HEADERS INCLUDE REGEX "(^|/)test/")
list(FILTER WANGLE_TEST_HEADERS EXCLUDE REGEX "(^|/)facebook/")

# Install headers preserving directory structure
wangle_install_headers(wangle ${CMAKE_CURRENT_SOURCE_DIR} ${WANGLE_HEADERS})
Expand Down
22 changes: 8 additions & 14 deletions wangle/cmake/WangleFunctions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,20 @@
# limitations under the License.

# Install header files preserving directory structure
# Similar to folly's auto_install_files()
function(wangle_install_headers rootName rootDir)
file(TO_CMAKE_PATH "${rootDir}" rootDir)
string(LENGTH "${rootDir}" rootDirLength)
foreach(fil ${ARGN})
file(TO_CMAKE_PATH "${fil}" filePath)
string(FIND "${filePath}" "/" rIdx REVERSE)
if(rIdx EQUAL -1)

# dirname $fil
string(FIND "${filePath}" "/" lastSlash REVERSE)
if(lastSlash EQUAL -1)
continue()
endif()
string(SUBSTRING "${filePath}" 0 ${rIdx} filePath)

string(LENGTH "${filePath}" filePathLength)
string(FIND "${filePath}" "${rootDir}" rIdx)
if(rIdx EQUAL 0)
math(EXPR filePathLength "${filePathLength} - ${rootDirLength}")
string(SUBSTRING "${filePath}" ${rootDirLength} ${filePathLength} fileGroup)
install(FILES ${fil}
DESTINATION ${INCLUDE_INSTALL_DIR}/${rootName}${fileGroup})
endif()
string(SUBSTRING "${filePath}" 0 ${lastSlash} dirName)

install(FILES ${fil}
DESTINATION ${INCLUDE_INSTALL_DIR}/${rootName}/${dirName})
endforeach()
endfunction()

Expand Down