Skip to content

Conversation

@robinlinden
Copy link
Member

@robinlinden robinlinden commented Jan 7, 2022

Before this patch, we would only add the jni.h include path if both JNI
and AWT were found as FindJNI.cmake only sets JNI_FOUND if both JNI and
AWT were found, requiring you to install openjdk-11-jdk instead of
openjdk-11-jdk-headless for the build to succeed.

After this patch both the headless and the full jdk is fine.

See: https://cmake.org/cmake/help/v3.22/module/FindJNI.html


This change is Reviewable

@robinlinden robinlinden changed the title Only require jni.h to be found when searching for the JNI chore: Only require jni.h to be found when searching for the JNI Jan 7, 2022
@auto-add-label auto-add-label bot added the chore Updating grunt tasks etc; no production code change label Jan 7, 2022
@robinlinden robinlinden added this to the master milestone Jan 7, 2022
Before this patch, we would only add the jni.h include path if both JNI
and AWT were found as FindJNI.cmake only sets JNI_FOUND if both JNI and
AWT were found, requiring you to install openjdk-11-jdk instead of
openjdk-11-jdk-headless for the build to succeed.

After this patch both the headless and the full jdk is fine.

See: https://cmake.org/cmake/help/v3.22/module/FindJNI.html
@robinlinden robinlinden force-pushed the allow-headless-build branch from 1b87350 to 5003b0d Compare January 7, 2022 19:20
Copy link
Member

@JFreegman JFreegman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 1 approvals obtained

@robinlinden robinlinden merged commit 5003b0d into TokTok:master Jan 9, 2022
@robinlinden robinlinden deleted the allow-headless-build branch January 9, 2022 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

chore Updating grunt tasks etc; no production code change

Development

Successfully merging this pull request may close these issues.

2 participants