Skip to content

Commit d7a7c52

Browse files
committed
find_library seems not recusrive on macos
1 parent 0786449 commit d7a7c52

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,12 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT WIN32)
229229
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem${WEBRTCROOT}/src/third_party/libc++/src/include")
230230
endif()
231231
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${WEBRTCROOT}/src/buildtools/third_party/libc++ -nostdinc++ -isystem${WEBRTCROOT}/src/third_party/libc++abi/src/include -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE")
232-
find_library(LIBC++ NAMES c++ HINTS "${WEBRTCOBJS}/buildtools/third_party" NO_DEFAULT_PATH)
232+
find_library(LIBC++ NAMES c++ HINTS "${WEBRTCOBJS}/buildtools/third_party/libc++" NO_DEFAULT_PATH)
233233
if (LIBC++)
234234
message(STATUS "Found libc++ library at ${LIBC++}")
235235
target_link_libraries(${CMAKE_PROJECT_NAME} "${LIBC++}")
236236
endif()
237-
find_library(LIBC++ABI NAMES c++abi HINTS "${WEBRTCOBJS}/buildtools/third_party" NO_DEFAULT_PATH)
237+
find_library(LIBC++ABI NAMES c++abi HINTS "${WEBRTCOBJS}/buildtools/third_party/libc++abi" NO_DEFAULT_PATH)
238238
if (LIBC++ABI)
239239
message(STATUS "Found libc++abi library at ${LIBC++ABI}")
240240
target_link_libraries(${CMAKE_PROJECT_NAME} "${LIBC++ABI}")
@@ -352,12 +352,13 @@ endif()
352352
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
353353
message(STATUS "Compiler is Clang CMAKE_LIBRARY_ARCHITECTURE:${CMAKE_LIBRARY_ARCHITECTURE} CMAKE_SYSTEM_PROCESSOR:${CMAKE_SYSTEM_PROCESSOR}")
354354
if(CMAKE_SYSTEM_PROCESSOR MATCHES "armv.*")
355-
add_definitions(-target arm-linux-gnueabihf)
355+
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -target arm-linux-gnueabihf)
356+
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem${CMAKE_FIND_ROOT_PATH}/usr/include/arm-linux-gnueabihf")
356357
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
357358
if (NOT APPLE)
358-
add_definitions(-target aarch64-linux-gnu)
359+
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -target aarch64-linux-gnu)
359360
else ()
360-
add_definitions(-target aarch64-apple-macos)
361+
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -target aarch64-apple-macos)
361362
endif()
362363
endif()
363364
endif()

Dockerfile.arm64

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
1414
&& cd ../webrtc \
1515
&& fetch --nohooks webrtc \
1616
&& cd ../webrtc-streamer \
17-
&& cmake -DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY -DWEBRTCDESKTOPCAPTURE=OFF . && make \
17+
&& cmake -DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY -DWEBRTCDESKTOPCAPTURE=OFF . \
18+
&& make VERBOSE=1 \
1819
&& make install \
1920
&& rm -rf ../webrtc && rm -f *.a && rm -f src/*.o \
2021
&& apt-get clean && rm -rf /var/lib/apt/lists/

0 commit comments

Comments
 (0)