diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c2d02c2e..52c9250bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,11 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_C_EXTENSIONS OFF) set(CMAKE_C_STANDARD 99) +if(APPLE) + set(CMAKE_AR "/usr/bin/ar") + set(CMAKE_RANLIB "/usr/bin/ranlib") +endif() + message(STATUS "OpenThread Source Directory: ${PROJECT_SOURCE_DIR}") target_include_directories(ot-config INTERFACE diff --git a/examples/apps/cli/ftd.cmake b/examples/apps/cli/ftd.cmake index 6cbe17ef8..30d07462b 100644 --- a/examples/apps/cli/ftd.cmake +++ b/examples/apps/cli/ftd.cmake @@ -56,7 +56,7 @@ target_link_libraries(ot-cli-ftd PRIVATE ) if(OT_LINKER_MAP) - if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") + if(APPLE) target_link_libraries(ot-cli-ftd PRIVATE -Wl,-map,ot-cli-ftd.map) else() target_link_libraries(ot-cli-ftd PRIVATE -Wl,-Map=ot-cli-ftd.map) diff --git a/examples/apps/cli/mtd.cmake b/examples/apps/cli/mtd.cmake index df15ac713..cef614bd9 100644 --- a/examples/apps/cli/mtd.cmake +++ b/examples/apps/cli/mtd.cmake @@ -56,7 +56,7 @@ target_link_libraries(ot-cli-mtd PRIVATE ) if(OT_LINKER_MAP) - if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") + if(APPLE) target_link_libraries(ot-cli-mtd PRIVATE -Wl,-map,ot-cli-mtd.map) else() target_link_libraries(ot-cli-mtd PRIVATE -Wl,-Map=ot-cli-mtd.map) diff --git a/examples/apps/cli/radio.cmake b/examples/apps/cli/radio.cmake index 442407426..3ace85062 100644 --- a/examples/apps/cli/radio.cmake +++ b/examples/apps/cli/radio.cmake @@ -60,7 +60,7 @@ target_link_libraries(ot-cli-radio PRIVATE ) if(OT_LINKER_MAP) - if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") + if(APPLE) target_link_libraries(ot-cli-radio PRIVATE -Wl,-map,ot-cli-radio.map) else() target_link_libraries(ot-cli-radio PRIVATE -Wl,-Map=ot-cli-radio.map) diff --git a/examples/apps/ncp/ftd.cmake b/examples/apps/ncp/ftd.cmake index a7ffa51ad..fea80e5cb 100644 --- a/examples/apps/ncp/ftd.cmake +++ b/examples/apps/ncp/ftd.cmake @@ -49,7 +49,7 @@ target_link_libraries(ot-ncp-ftd PRIVATE ) if(OT_LINKER_MAP) - if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") + if(APPLE) target_link_libraries(ot-ncp-ftd PRIVATE -Wl,-map,ot-ncp-ftd.map) else() target_link_libraries(ot-ncp-ftd PRIVATE -Wl,-Map=ot-ncp-ftd.map) diff --git a/examples/apps/ncp/mtd.cmake b/examples/apps/ncp/mtd.cmake index 2fecbacc0..9e101a69c 100644 --- a/examples/apps/ncp/mtd.cmake +++ b/examples/apps/ncp/mtd.cmake @@ -49,7 +49,7 @@ target_link_libraries(ot-ncp-mtd PRIVATE ) if(OT_LINKER_MAP) - if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") + if(APPLE) target_link_libraries(ot-ncp-mtd PRIVATE -Wl,-map,ot-ncp-mtd.map) else() target_link_libraries(ot-ncp-mtd PRIVATE -Wl,-Map=ot-ncp-mtd.map) diff --git a/examples/apps/ncp/rcp.cmake b/examples/apps/ncp/rcp.cmake index 0f8be335a..681cd6ad0 100644 --- a/examples/apps/ncp/rcp.cmake +++ b/examples/apps/ncp/rcp.cmake @@ -48,7 +48,7 @@ target_link_libraries(ot-rcp PRIVATE ) if(OT_LINKER_MAP) - if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") + if(APPLE) target_link_libraries(ot-rcp PRIVATE -Wl,-map,ot-rcp.map) else() target_link_libraries(ot-rcp PRIVATE -Wl,-Map=ot-rcp.map) diff --git a/src/core/ftd.cmake b/src/core/ftd.cmake index e3e3462a5..527a2c179 100644 --- a/src/core/ftd.cmake +++ b/src/core/ftd.cmake @@ -39,7 +39,7 @@ target_compile_options(openthread-ftd PRIVATE -Wundef ) -if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") +if(APPLE) target_compile_options(openthread-ftd PRIVATE -Wimplicit-int-conversion) endif() diff --git a/src/core/mtd.cmake b/src/core/mtd.cmake index 1a4f71b45..176d0b2d2 100644 --- a/src/core/mtd.cmake +++ b/src/core/mtd.cmake @@ -39,7 +39,7 @@ target_compile_options(openthread-mtd PRIVATE -Wundef ) -if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") +if(APPLE) target_compile_options(openthread-mtd PRIVATE -Wimplicit-int-conversion) endif() diff --git a/src/core/radio.cmake b/src/core/radio.cmake index b1974f88b..a509fdfe4 100644 --- a/src/core/radio.cmake +++ b/src/core/radio.cmake @@ -40,7 +40,7 @@ target_compile_options(openthread-radio PRIVATE -Wundef ) -if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") +if(APPLE) target_compile_options(openthread-radio PRIVATE -Wimplicit-int-conversion) endif() diff --git a/src/posix/cli.cmake b/src/posix/cli.cmake index a11ef0b85..1c6955f2e 100644 --- a/src/posix/cli.cmake +++ b/src/posix/cli.cmake @@ -59,7 +59,7 @@ target_link_libraries(ot-cli PRIVATE ) if(OT_LINKER_MAP) - if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") + if(APPLE) target_link_libraries(ot-cli PRIVATE -Wl,-map,ot-cli.map) else() target_link_libraries(ot-cli PRIVATE -Wl,-Map=ot-cli.map) diff --git a/src/posix/daemon.cmake b/src/posix/daemon.cmake index dd19a2280..c63de45e4 100644 --- a/src/posix/daemon.cmake +++ b/src/posix/daemon.cmake @@ -51,7 +51,7 @@ target_link_libraries(ot-daemon PRIVATE ) if(OT_LINKER_MAP) - if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") + if(APPLE) target_link_libraries(ot-daemon PRIVATE -Wl,-map,ot-daemon.map) else() target_link_libraries(ot-daemon PRIVATE -Wl,-Map=ot-daemon.map) @@ -78,7 +78,7 @@ target_link_libraries(ot-ctl PRIVATE ) if(OT_LINKER_MAP) - if("${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") + if(APPLE) target_link_libraries(ot-ctl PRIVATE -Wl,-map,ot-ctl.map) else() target_link_libraries(ot-ctl PRIVATE -Wl,-Map=ot-ctl.map)