Skip to content

Commit

Permalink
[darwin] create macro for ARC enabling
Browse files Browse the repository at this point in the history
  • Loading branch information
kambala-decapitator committed Aug 8, 2019
1 parent e27ffa6 commit bed3d3b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
8 changes: 8 additions & 0 deletions cmake/scripts/darwin/Macros.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
macro(enable_arc)
if(CMAKE_GENERATOR STREQUAL Xcode)
set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-arc")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fobjc-arc")
endif()
endmacro()
8 changes: 2 additions & 6 deletions cmake/scripts/darwin_embedded/ArchSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,8 @@ set(CMAKE_XCODE_ATTRIBUTE_INLINES_ARE_PRIVATE_EXTERN OFF)
set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN OFF)
set(CMAKE_XCODE_ATTRIBUTE_COPY_PHASE_STRIP OFF)

if(CMAKE_GENERATOR STREQUAL Xcode)
set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-arc")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fobjc-arc")
endif()
include(cmake/scripts/darwin/Macros.cmake)
enable_arc()

# Xcode strips dead code by default which breaks wrapping
set(CMAKE_XCODE_ATTRIBUTE_DEAD_CODE_STRIPPING OFF)
Expand Down
8 changes: 2 additions & 6 deletions cmake/scripts/osx/ArchSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,5 @@ list(APPEND DEPLIBS "-framework DiskArbitration" "-framework IOKit"
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
set(CMAKE_XCODE_ATTRIBUTE_CLANG_LINK_OBJC_RUNTIME OFF)

if(CMAKE_GENERATOR STREQUAL Xcode)
set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-arc")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fobjc-arc")
endif()
include(cmake/scripts/darwin/Macros.cmake)
enable_arc()

0 comments on commit bed3d3b

Please sign in to comment.