Update CMakeLists Targets for integration#1227
Open
jbltx wants to merge 1 commit intoValveSoftware:masterfrom
Open
Update CMakeLists Targets for integration#1227jbltx wants to merge 1 commit intoValveSoftware:masterfrom
jbltx wants to merge 1 commit intoValveSoftware:masterfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I have just added some configuration in the
src/CMakeLists.txtfile to get a more user-friendly integration when using the API in other applications. The modifications are :INCLUDE_DIRas a variable, depending on the CMake usage (BUILD/INSTALL)EXPORTparameter oninstallcommand to generateOpenVRTargets.cmakeOpenVRConfig.cmake, including itself the generatedOpenVRTargets.cmakefileBuild:
Output:
Integration:
Notes
FindOpenVR.cmakefile anymore.OpenVRConfig.cmakeinstead of directly have the generated content in the file is for extensibility purposes, we can always overwrite things made by CMake.openvr_apican break things in the workflow. It seems to be a huge change, but it makes life easier during integration, as the API has the same name, no matter the platform. Also in your distribution, the library for WIndows 64bits is not namedopenvr_api64butopenvr_api(see inlib/win64andbin/win64folder).I am of course open to any change if you have better ideas to get a successful merge.