CMakeLists.txt: Adjust OpenCL probing to find OCL SDK Light #2239
Conversation
This file contains 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
… and prefer it over AMD APP SDK if both are installed
psychocrypt
approved these changes
Feb 14, 2019
|
thx @Spudz76 |
Merged
gnagel
pushed a commit
to gnagel/xmr-stak
that referenced
this pull request
Mar 23, 2019
CMakeLists.txt: Adjust OpenCL probing to find OCL SDK Light
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.
Add
OCL_ROOTenvvar support for Windows OCL SDK Light autodetection and prefer it over AMD APP SDK if both are installed. Tested on Win7 with both SDKs installed (and all CUDAs and Intel OpenCL SDK also... haha) it still selected properly.OCL_ROOTenvvar can be preloaded with alternate OpenCL and I have also tested using it to point to nVidia OpenCL and etc, CMake finds all and result builds fine. Older versions you would have usedAMDAPPSDKROOTenvvar to do the same thing, but whenOCL_ROOTexists it will take precedence over all.Moved
CMAKE_PREFIX_PATHhandling all to the top, previously the$ENV{CMAKE_PREFIX_PATH}would be added to the list twice (once at top and once after AMD path).Fixes #2235 proper user expectation that it should detect automatically and build without calculating and passing exact locations.