Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
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
Bret Brown
CMake
Commits
efa0e2dd
Commit
efa0e2dd
authored
1 year ago
by
oyarzun
Committed by
Brad King
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
FindJNI: Update for Xcode greater than 12.1 on macOS
`JavaVM.framework` was removed from Xcode in version 12.2+. Fixes: #23364
parent
cbcd2978
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Modules/FindJNI.cmake
+17
-0
17 additions, 0 deletions
Modules/FindJNI.cmake
with
17 additions
and
0 deletions
Modules/FindJNI.cmake
+
17
−
0
View file @
efa0e2dd
...
...
@@ -383,6 +383,23 @@ foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
endforeach
()
if
(
APPLE
)
if
(
DEFINED XCODE_VERSION
)
set
(
_FindJNI_XCODE_VERSION
"
${
XCODE_VERSION
}
"
)
else
()
# get xcode version
execute_process
(
COMMAND xcodebuild -version
OUTPUT_VARIABLE _xcode_version
)
string
(
REGEX REPLACE
"Xcode ([0-9]+(
\\
.[0-9]+)*)"
"
\\
1"
_FindJNI_XCODE_VERSION
${
_xcode_version
}
)
unset
(
_xcode_version
)
endif
()
if
(
_FindJNI_XCODE_VERSION VERSION_GREATER 12.1
)
set
(
CMAKE_FIND_FRAMEWORK
"NEVER"
)
endif
()
unset
(
_FindJNI_XCODE_VERSION
)
if
(
CMAKE_FIND_FRAMEWORK STREQUAL
"ONLY"
)
set
(
_JNI_SEARCHES FRAMEWORK
)
elseif
(
CMAKE_FIND_FRAMEWORK STREQUAL
"NEVER"
)
...
...
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