[Bf-blender-cvs] [8fb806ab15f] master: Revert "Generate Xcode scheme files during configuration."
Ankit Meel
noreply at git.blender.org
Sat Sep 26 19:50:55 CEST 2020
Commit: 8fb806ab15fcbfcfaad59d68af3b9d1ccaf11fed
Author: Ankit Meel
Date: Sat Sep 26 14:28:40 2020 +0530
Branches: master
https://developer.blender.org/rB8fb806ab15fcbfcfaad59d68af3b9d1ccaf11fed
Revert "Generate Xcode scheme files during configuration."
This reverts commit 5eb5978043c8e7036e15572e.
The change was problematic:
*Advanced users may prefer managing schemes manually and adding only
a few that they need, instead of one for every library/executable
Blender builds.
*If CMake creates schema files, it overwrites the changes a developer
made every time CMake is run. If Xcode creates scheme files, it keeps
settings/ environment variables intact.
If someone runs CMake very frequently, pass
`-DCMAKE_XCODE_GENERATE_SCHEME=ON` to `cmake` while configuring.
===================================================================
M build_files/cmake/platform/platform_apple_xcode.cmake
===================================================================
diff --git a/build_files/cmake/platform/platform_apple_xcode.cmake b/build_files/cmake/platform/platform_apple_xcode.cmake
index 7e6bd14ecc3..3a43ca317dd 100644
--- a/build_files/cmake/platform/platform_apple_xcode.cmake
+++ b/build_files/cmake/platform/platform_apple_xcode.cmake
@@ -154,11 +154,3 @@ if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
add_definitions("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()
-
-if(${CMAKE_GENERATOR} MATCHES "Xcode")
- # Generate schemes in Blender.xcodeproj/xcshareddata/xcschemes/ early, at
- # configuration time, not when Xcode is opened.
- # This gets rid of "Manage schemes automatically" confirmation dialog that
- # appears whenever CMake is run.
- set(CMAKE_XCODE_GENERATE_SCHEME ON)
-endif()
More information about the Bf-blender-cvs
mailing list