Update CMakeLists for ARM architecture and Clang

Author: mpromonet

CMakeLists.txt

@@ -19,7 +19,7 @@ set (CMAKE_CXX_EXTENSIONS OFF)
 
 # set CMAKE_FIND_ROOT_PATH to search package in WebRTC sysroot
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "armv.*")
-  set (CMAKE_FIND_ROOT_PATH ${WEBRTCROOT}/src/build/linux/debian_bullseye_arm-sysroot)
+  set (CMAKE_FIND_ROOT_PATH ${WEBRTCROOT}/src/build/linux/debian_bullseye_armhf-sysroot)
   add_compile_options(--sysroot=${CMAKE_FIND_ROOT_PATH})
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
   set (CMAKE_FIND_ROOT_PATH ${WEBRTCROOT}/src/build/linux/debian_bullseye_arm64-sysroot)
@@ -41,7 +41,8 @@ MESSAGE("PATH = $ENV{PATH}")
 find_package(Git)
 
 # webrtc build
-set (WEBRTCOBJS ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE}/obj)
+set (WEBRTCBUILD ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE})
+set (WEBRTCOBJS ${WEBRTCBUILD}/obj)
 
 if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_LIBRARY_SUFFIX})
   if(GIT_FOUND)
@@ -57,7 +58,7 @@ if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_
 
   if(CMAKE_SYSTEM_PROCESSOR MATCHES "armv.*")
     EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src
-                    COMMAND build/linux/sysroot_scripts/install-sysroot.py --arch=arm
+                    COMMAND build/linux/sysroot_scripts/install-sysroot.py --arch=armhf
                     RESULT_VARIABLE SYSROOT_RESULT
                     OUTPUT_VARIABLE SYSROOT_OUTPUT
                     ERROR_VARIABLE SYSROOT_ERROR
@@ -85,7 +86,7 @@ if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_
 
   set (WEBRTCARGS rtc_include_tests=false\nrtc_enable_protobuf=false\nrtc_build_examples=false\nrtc_build_tools=false\ntreat_warnings_as_errors=false\nenable_js_protobuf=false\nuse_glib=false\n)
   set (WEBRTCARGS libyuv_use_sme=false\n${WEBRTCARGS})
-  if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT WIN32)
     set (WEBRTCARGS use_custom_libcxx=true\n${WEBRTCARGS})
   else()
     set (WEBRTCARGS use_custom_libcxx=false\n${WEBRTCARGS})
@@ -210,26 +211,64 @@ MESSAGE("VERSION = ${VERSION}")
 add_definitions(-DWEBRTCSTREAMERRESSOURCE=\"${WEBRTCSTREAMERRESSOURCE}\")
 MESSAGE("WEBRTCSTREAMERRESSOURCE = ${WEBRTCSTREAMERRESSOURCE}")
 
+# clang custom libc++
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  if (NOT WIN32)
+    message(STATUS "Using Clang: enabling libc++")
+
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc++")
+    add_compile_definitions(_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE)
+    add_compile_options(-I${WEBRTCROOT}/src/buildtools/third_party/libc++)
+    if (EXISTS ${WEBRTCBUILD}/gen/third_party/libc++/src/include)
+      add_compile_options(-isystem${WEBRTCBUILD}/gen/third_party/libc++/src/include)
+    else()
+      add_compile_options(-isystem${WEBRTCROOT}/src/third_party/libc++/src/include)
+    endif()
+    add_compile_options(-isystem${WEBRTCROOT}/src/third_party/libc++abi/src/include)
+    find_library(LIBC++ NAMES c++ HINTS "${WEBRTCOBJS}/buildtools/third_party/libc++" NO_DEFAULT_PATH)
+    find_library(LIBC++ABI NAMES c++abi HINTS "${WEBRTCOBJS}/buildtools/third_party/libc++abi" NO_DEFAULT_PATH)
+    add_compile_options(-Wno-nullability-completeness)
+  endif()
+
+  message(STATUS "Compiler is Clang CMAKE_LIBRARY_ARCHITECTURE:${CMAKE_LIBRARY_ARCHITECTURE} CMAKE_SYSTEM_PROCESSOR:${CMAKE_SYSTEM_PROCESSOR}")
+  if(CMAKE_SYSTEM_PROCESSOR MATCHES "armv.*")
+    add_compile_options(-isystem${CMAKE_FIND_ROOT_PATH}/usr/include/arm-linux-gnueabihf -target arm-linux-gnueabihf)
+  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
+    if (NOT APPLE)
+      add_compile_options(-isystem${CMAKE_FIND_ROOT_PATH}/usr/include/aarch64-linux-gnu -arch arm64)
+    else ()
+      add_compile_options(-target aarch64-apple-macos)
+    endif()
+  endif()
+endif()
+
 # project target
 FILE(GLOB_RECURSE WEBRTJSONCPPCOBJS ${WEBRTCOBJS}/third_party/jsoncpp/jsoncpp/*${CMAKE_C_OUTPUT_EXTENSION} ${WEBRTCOBJS}/rtc_base/rtc_json/*${CMAKE_C_OUTPUT_EXTENSION})
 FILE(GLOB_RECURSE WEBRTP2POBJ ${WEBRTCOBJS}/p2p/p2p_server_utils/*${CMAKE_C_OUTPUT_EXTENSION})
 SET (WEBRTCEXTRAOBJS ${WEBRTJSONCPPCOBJS} ${WEBRTP2POBJ} ${WEBRTCCOMOBJ})
 FILE(GLOB SOURCE src/*.cpp)
 add_executable (${CMAKE_PROJECT_NAME} ${SOURCE} ${WEBRTCEXTRAOBJS})
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE inc)
+if (LIBC++)
+  message(STATUS "Found libc++ library at ${LIBC++}")
+  target_link_libraries(${CMAKE_PROJECT_NAME} "${LIBC++}")
+endif()
+if (LIBC++ABI)
+  message(STATUS "Found libc++abi library at ${LIBC++ABI}")
+  target_link_libraries(${CMAKE_PROJECT_NAME} "${LIBC++ABI}")
+endif()
 
-# webrtc
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  message(STATUS "Using Clang: enabling libc++")
+# cxxopts
+target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE cxxopts/include)
+target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE CXXOPTS_NO_RTTI)
 
-  if (WIN32)
-    target_link_libraries(${CMAKE_PROJECT_NAME} "/DEFAULTLIB:msvcprt.lib")
-  else()
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${WEBRTCROOT}/src/buildtools/third_party/libc++ -nostdinc++ -isystem${WEBRTCROOT}/src/third_party/libc++/src/include -isystem${WEBRTCROOT}/src/third_party/libc++abi/src/include -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE")
-    target_link_libraries(${CMAKE_PROJECT_NAME} "${WEBRTCOBJS}/buildtools/third_party/libc++/${CMAKE_STATIC_LIBRARY_PREFIX}c++${CMAKE_STATIC_LIBRARY_SUFFIX}" "${WEBRTCOBJS}/buildtools/third_party/libc++abi/${CMAKE_STATIC_LIBRARY_PREFIX}c++abi${CMAKE_STATIC_LIBRARY_SUFFIX}")
-  endif()
-endif()
+# thread
+set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+find_package (Threads)
+target_link_libraries (${CMAKE_PROJECT_NAME} Threads::Threads)
 
+# webrtc
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${WEBRTCROOT}/src ${WEBRTCROOT}/src/third_party/abseil-cpp ${WEBRTCROOT}/src/third_party/jsoncpp/source/include  ${WEBRTCROOT}/src/third_party/jsoncpp/generated ${WEBRTCROOT}/src/third_party/libyuv/include)
 
 set(WEBRTC_LIBS_INFO
@@ -244,36 +283,7 @@ set(WEBRTC_LIBS_INFO
 foreach(LIB ${WEBRTC_LIBS_INFO})
     target_link_libraries(${CMAKE_PROJECT_NAME} ${LIB})
 endforeach()
-add_definitions(-DHAVE_JPEG)
-
-# cxxopts
-target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE cxxopts/include)
-target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE CXXOPTS_NO_RTTI)
-
-# thread
-set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-find_package (Threads)
-target_link_libraries (${CMAKE_PROJECT_NAME} Threads::Threads)
-
-# civetweb
-add_library (civetweb STATIC civetweb/src/civetweb.c civetweb/src/CivetServer.cpp)
-target_compile_definitions(civetweb PUBLIC -DOPENSSL_API_3_0 -DUSE_WEBSOCKET)
-target_link_libraries (${CMAKE_PROJECT_NAME} civetweb)
-target_include_directories(civetweb PUBLIC civetweb/include)
-
-# rtmp ?
-find_package(PkgConfig QUIET)
-pkg_check_modules(RTMP QUIET librtmp)
-MESSAGE("RTMP_FOUND = ${RTMP_FOUND} RTMP_INCLUDE_DIRS=${RTMP_INCLUDE_DIRS} RTMP_LIBRARY_DIRS=${RTMP_LIBRARY_DIRS} RTMP_LIBRARIES=${RTMP_LIBRARIES}")
-if (RTMP_FOUND)
-  add_definitions(-DHAVE_RTMP)
-  target_include_directories (${CMAKE_PROJECT_NAME} PUBLIC ${RTMP_INCLUDE_DIRS})
-  target_link_directories (${CMAKE_PROJECT_NAME} PUBLIC ${RTMP_LIBRARY_DIRS})
-  find_library(RTMP_LIB rtmp)
-  MESSAGE("RTMP_LIB=${RTMP_LIB}")
-  target_link_libraries (${CMAKE_PROJECT_NAME} ${RTMP_LIB})
-endif()
+target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE HAVE_JPEG)
 
 # compiler specific
 if (WIN32)
@@ -283,19 +293,24 @@ if (WIN32)
       string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
     endforeach()
 
+    # live555
+    add_definitions(-D_HAS_ITERATOR_DEBUGGING=0 -D_WINSOCKAPI_)
+
     # webrtc
-    add_definitions(-DWEBRTC_WIN -EHsc -DNOMINMAX -D__PRETTY_FUNCTION__=__FUNCTION__ -D_HAS_ITERATOR_DEBUGGING=0)
-    add_definitions(-DUSE_X11 -DHAVE_SOUND -D_WINSOCKAPI_)
+    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE WEBRTC_WIN EHsc NOMINMAX __PRETTY_FUNCTION__=__FUNCTION__)
+    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE USE_X11 HAVE_SOUND)
     target_link_libraries (${CMAKE_PROJECT_NAME} secur32 dmoguids wmcodecdspuuid strmiids msdmo winmm dxgi d3d11 iphlpapi dwmapi shcore)
 elseif (APPLE)
     # use lld to link
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld -B${WEBRTCROOT}/src/third_party/llvm-build/Release+Asserts/bin")
 
     # live555
     add_definitions(-DNEED_XLOCALE_H=1)
+
     # webrtc
-    add_definitions(-DHAVE_SOUND)
-    add_definitions(-DWEBRTC_MAC -DWEBRTC_POSIX -fno-rtti)
+    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE WEBRTC_MAC WEBRTC_POSIX)
+    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE HAVE_SOUND)
+    add_definitions(-fno-rtti)
 
     find_library(CORE_FOUNDATION Foundation)
     find_library(APPLICATION_SERVICES ApplicationServices)
@@ -313,41 +328,49 @@ else()
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld -B${WEBRTCROOT}/src/third_party/llvm-build/Release+Asserts/bin")
 
     # libv4l2cpp
-    add_definitions(-DHAVE_V4L2)
     aux_source_directory(libv4l2cpp/src LIBSRC_FILES)
     add_library(libv4l2cpp STATIC ${LIBSRC_FILES})
     target_include_directories(libv4l2cpp PUBLIC libv4l2cpp/inc)
+    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE HAVE_V4L2)
     target_link_libraries (${CMAKE_PROJECT_NAME} libv4l2cpp)
 
     # webrtc
-    add_definitions(-DWEBRTC_POSIX -fno-rtti -fpermissive)
+    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE WEBRTC_POSIX)
+    add_definitions(-fno-rtti -fpermissive)
     if (CMAKE_SYSTEM_PROCESSOR MATCHES "armv6.*")
         add_definitions(-marm -march=armv6 -mfpu=vfp -mfloat-abi=hard)
     endif()
     if (EXISTS ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE}/obj/modules/desktop_capture/desktop_capture.ninja)
-        add_definitions(-DUSE_X11)
+        target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE USE_X11)
         find_package(X11)
         target_link_libraries(${CMAKE_PROJECT_NAME} ${X11_LIBRARIES} ${X11_Xdamage_LIB} ${X11_Xfixes_LIB} ${X11_Xcomposite_LIB} ${X11_Xrandr_LIB} ${X11_Xtst_LIB})
     endif()
     # civetweb
     target_link_libraries(${CMAKE_PROJECT_NAME} dl)
     #alsa
     if (ALSA_FOUND)
-        add_definitions(-DHAVE_SOUND)
+        target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE HAVE_SOUND)
     endif()
 endif()
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    message(STATUS "Compiler is Clang CMAKE_LIBRARY_ARCHITECTURE:${CMAKE_LIBRARY_ARCHITECTURE} CMAKE_SYSTEM_PROCESSOR:${CMAKE_SYSTEM_PROCESSOR}")
-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "armv.*")
-      add_definitions(-target arm-linux-gnueabihf)
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
-      if (NOT APPLE)
-        add_definitions(-target aarch64-linux-gnu)
-      else ()
-        add_definitions(-target aarch64-apple-macos)
-      endif()
-    endif()
+
+# civetweb
+add_library (civetweb STATIC civetweb/src/civetweb.c civetweb/src/CivetServer.cpp)
+target_compile_definitions(civetweb PUBLIC OPENSSL_API_3_0 USE_WEBSOCKET)
+target_link_libraries (${CMAKE_PROJECT_NAME} civetweb)
+target_include_directories(civetweb PUBLIC civetweb/include)
+
+# rtmp ?
+find_package(PkgConfig QUIET)
+pkg_check_modules(RTMP QUIET librtmp)
+MESSAGE("RTMP_FOUND = ${RTMP_FOUND} RTMP_INCLUDE_DIRS=${RTMP_INCLUDE_DIRS} RTMP_LIBRARY_DIRS=${RTMP_LIBRARY_DIRS} RTMP_LIBRARIES=${RTMP_LIBRARIES}")
+if (RTMP_FOUND)
+  target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE HAVE_RTMP)
+  target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC ${RTMP_INCLUDE_DIRS})
+  target_link_directories(${CMAKE_PROJECT_NAME} PUBLIC ${RTMP_LIBRARY_DIRS})
+  find_library(RTMP_LIB rtmp)
+  MESSAGE("RTMP_LIB=${RTMP_LIB}")
+  target_link_libraries (${CMAKE_PROJECT_NAME} ${RTMP_LIB})
 endif()
 
 # prometheus
@@ -362,12 +385,13 @@ target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE prometheus-cpp/core/inc
 add_subdirectory(live555helper EXCLUDE_FROM_ALL)
 target_include_directories(liblive555helper PRIVATE ${WEBRTCROOT}/src/third_party/boringssl/src/include)
 target_link_libraries (${CMAKE_PROJECT_NAME} liblive555helper ${WEBRTCOBJS}/third_party/boringssl/${CMAKE_STATIC_LIBRARY_PREFIX}boringssl${CMAKE_STATIC_LIBRARY_SUFFIX}) 
-add_definitions(-DHAVE_LIVE555)
+target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE HAVE_LIVE555)
 
 # static link of libatomic on armv6l
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "armv6.*")
-    target_link_libraries (${CMAKE_PROJECT_NAME} -Wl,-Bstatic -latomic -Wl,-Bdynamic)
+  target_link_libraries (${CMAKE_PROJECT_NAME} -Wl,-Bstatic -latomic -Wl,-Bdynamic)
 endif()
+
 # static link of stdc++ if available
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   include(CheckCXXCompilerFlag)