Centralize XCode SDK ugliness.

helium · Feb 23, 2021 · 0ed9a36 · 0ed9a36
1 parent 4924b08
commit 0ed9a36
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/c_src/CMakeLists.txt b/c_src/CMakeLists.txt
@@ -12,6 +12,11 @@ include(ASan)
 IF (APPLE)
   set(CMAKE_MODULE_LINKER_FLAGS "-flat_namespace -undefined suppress")
   set(CMAKE_MACOSX_RPATH 1)
+  execute_process(COMMAND
+    xcrun --show-sdk-path
+    OUTPUT_VARIABLE APPLE_SDK_ROOT
+    )
+  set(GF_APPLE_ENV "SDKROOT=${APPLE_SDK_ROOT}")
 ENDIF()
 
 #

diff --git a/c_src/cmake/FindGFComplete.cmake b/c_src/cmake/FindGFComplete.cmake
@@ -5,14 +5,6 @@ if(CMAKE_BUILD_TYPE)
   string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE_UC)
 endif()
 
-if (APPLE)
-  execute_process(COMMAND
-    xcrun --show-sdk-path
-    OUTPUT_VARIABLE APPLE_SDK_ROOT
-    )
-  set(GF_APPLE_ENV "SDKROOT=${APPLE_SDK_ROOT}")
-endif()
-
 ExternalProject_Add(gf-complete
   PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/gf-complete
   GIT_REPOSITORY    https://github.com/ceph/gf-complete.git

diff --git a/c_src/cmake/FindJerasure.cmake b/c_src/cmake/FindJerasure.cmake
@@ -8,14 +8,6 @@ if(CMAKE_BUILD_TYPE)
   string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE_UC)
 endif()
 
-if (APPLE)
-  execute_process(COMMAND
-    xcrun --show-sdk-path
-    OUTPUT_VARIABLE APPLE_SDK_ROOT
-    )
-  set(GF_APPLE_ENV "SDKROOT=${APPLE_SDK_ROOT}")
-endif()
-
 ExternalProject_Add(jerasure
   PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/jerasure
   GIT_REPOSITORY    http://github.com/ceph/jerasure.git