File tree 1 file changed +6
-2
lines changed
1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING "Force unset of the deployment t
41
41
# Determine the cmake host system version so we know where to find the iOS SDKs
42
42
find_program (CMAKE_UNAME uname /bin /usr/bin /usr/local/bin)
43
43
if (CMAKE_UNAME)
44
- exec_program ( uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION )
44
+ execute_process ( COMMAND uname -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE )
45
45
string (REGEX REPLACE "^([0-9]+)\\ .([0-9]+).*$" "\\ 1" DARWIN_MAJOR_VERSION "${CMAKE_HOST_SYSTEM_VERSION} " )
46
46
endif (CMAKE_UNAME)
47
47
@@ -127,7 +127,11 @@ set(IOS_DEPLOYMENT_TARGET ${IOS_DEPLOYMENT_TARGET} CACHE STRING "Minimum iOS ver
127
127
128
128
# Setup iOS developer location unless specified manually with CMAKE_IOS_DEVELOPER_ROOT
129
129
# Note Xcode 4.3 changed the installation location, choose the most recent one available
130
- exec_program (/usr/bin/xcode-select ARGS -print-path OUTPUT_VARIABLE CMAKE_XCODE_DEVELOPER_DIR)
130
+ execute_process (
131
+ COMMAND /usr/bin/xcode-select -print-path
132
+ OUTPUT_VARIABLE CMAKE_XCODE_DEVELOPER_DIR
133
+ OUTPUT_STRIP_TRAILING_WHITESPACE
134
+ )
131
135
set (XCODE_POST_43_ROOT "${CMAKE_XCODE_DEVELOPER_DIR} /Platforms/${IOS_PLATFORM_LOCATION} /Developer" )
132
136
set (XCODE_PRE_43_ROOT "/Developer/Platforms/${IOS_PLATFORM_LOCATION} /Developer" )
133
137
if (NOT CMAKE_IOS_DEVELOPER_ROOT)
You can’t perform that action at this time.
0 commit comments