Skip to content

Commit c2dfae3

Browse files
committed
Forward CMAKE_CXX_FLAGS and CMAKE_CXX_STANDARD to vendored projects
This is primarily needed to ensure the libc++ override takes effect and also makes sure we don't default to a likely too old CMAKE_CXX_STANDARD from upstream defaults.
1 parent 8b0a654 commit c2dfae3

File tree

4 files changed

+4
-0
lines changed

4 files changed

+4
-0
lines changed

third-party/fizz/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ ExternalProject_Add(
5353

5454
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
5555
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
56+
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
5657
-DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
5758

5859
-DBUILD_TESTS=OFF

third-party/mvfst/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ ExternalProject_Add(
2727

2828
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
2929
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
30+
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
3031
-DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
3132

3233
-DBUILD_TESTS=OFF

third-party/tbb/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ ExternalProject_Add(
2020
tbb_root=${TBB_ROOT}
2121
CC=${CMAKE_C_COMPILER}
2222
CXX=${CMAKE_CXX_COMPILER}
23+
CXXFLAGS=${CMAKE_CXX_FLAGS}
2324
# TODO: We should pass CFLAGS/CXXFLAGS.
2425
tbb
2526
INSTALL_COMMAND ""

third-party/wangle/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ ExternalProject_Add(
3737

3838
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
3939
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
40+
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
4041
-DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
4142

4243
-DBUILD_TESTS=OFF

0 commit comments

Comments
 (0)