Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BlenderPhi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
raas
BlenderPhi
Commits
70080d00
Commit
70080d00
authored
12 years ago
by
Jens Verwiebe
Browse files
Options
Downloads
Patches
Plain Diff
OSX/cmake-2.8-10: just reorder, now sdk must be set before deployment target
parent
5ff30179
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+14
-14
14 additions, 14 deletions
CMakeLists.txt
with
14 additions
and
14 deletions
CMakeLists.txt
+
14
−
14
View file @
70080d00
...
...
@@ -289,10 +289,6 @@ if(APPLE)
set
(
OSX_SYSTEM unsupported
)
endif
()
message
(
STATUS
"Detected system-version: "
${
OSX_SYSTEM
}
)
if
(
NOT CMAKE_OSX_DEPLOYMENT_TARGET
)
set
(
CMAKE_OSX_DEPLOYMENT_TARGET
"10.6"
CACHE STRING
""
FORCE
)
# 10.6 is our min. target, if you use higher sdk, weak linking happens - with 10.5 we have still not solved problems, build those with 10.5.sdk for now !!!
endif
()
if
(
${
CMAKE_GENERATOR
}
MATCHES
"Xcode"
)
...
...
@@ -319,6 +315,20 @@ if(APPLE)
endif
()
message
(
STATUS
"Detected Xcode-version: "
${
XCODE_VERSION
}
)
if
(
${
XCODE_VERSION
}
VERSION_LESS 4.3
)
set
(
CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX
${
OSX_SYSTEM
}
.sdk CACHE PATH
""
FORCE
)
# use guaranteed existing sdk
else
()
# note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
# absolute pathes are more foolproof here !
set
(
OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform
)
set
(
OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX
${
OSX_SYSTEM
}
.sdk
)
# use guaranteed existing sdk
set
(
CMAKE_OSX_SYSROOT
${
OSX_SYSROOT_PREFIX
}
/
${
OSX_DEVELOPER_PREFIX
}
CACHE PATH
""
FORCE
)
endif
()
if
(
NOT CMAKE_OSX_DEPLOYMENT_TARGET
)
set
(
CMAKE_OSX_DEPLOYMENT_TARGET
"10.5"
CACHE STRING
""
FORCE
)
# 10.5 is our min. target, if you use higher sdk, weak linking happens
endif
()
option
(
WITH_COCOA
"Use Cocoa framework instead of deprecated Carbon"
ON
)
option
(
USE_QTKIT
"Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)"
OFF
)
...
...
@@ -1321,16 +1331,6 @@ elseif(APPLE)
set
(
WITH_LIBS10.5 ON CACHE BOOL
"Use 10.5 libs"
FORCE
)
# valid also for 10.6/10.7
endif
()
if
(
${
XCODE_VERSION
}
VERSION_LESS 4.3
)
set
(
CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX
${
OSX_SYSTEM
}
.sdk CACHE PATH
""
FORCE
)
# use guaranteed existing sdk
else
()
# note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
# absolute pathes are more foolproof here !
set
(
OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform
)
set
(
OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX
${
OSX_SYSTEM
}
.sdk
)
# use guaranteed existing sdk
set
(
CMAKE_OSX_SYSROOT
${
OSX_SYSROOT_PREFIX
}
/
${
OSX_DEVELOPER_PREFIX
}
CACHE PATH
""
FORCE
)
endif
()
if
(
WITH_LIBS10.5
)
set
(
LIBDIR
${
CMAKE_SOURCE_DIR
}
/../lib/darwin-9.x.universal
)
else
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment