build: Change cmake option USE_OPTIX -> OSL_USE_OPTIX #1668
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
|
Does this look ok to everyone? It seems fine with OSL internals, but I want to make sure people building externally are aware of (and ok with) the name change so it doesn't break your OSL builds if you need the OptiX support enabled. |
lgritz
force-pushed
the
lg-useoptix
branch
2 times, most recently
from
f640613
to
4e8753d
Compare
This avoids some possible confusion with other projects, or if this is built as a subproject. Also, change from the C++ side having an OSL_USE_OPTIX defined -- only for building OSL itself -- to having it always defined in oslconfig.h and set to 0 or 1 depending on whether OptiX support was turned on at build time. This allows app-side use of OSL headers to know if it's dealing with an OptiX-capable OSL build. Signed-off-by: Larry Gritz <lg@larrygritz.com>
Signed-off-by: Larry Gritz <lg@larrygritz.com>
brechtvl
added a commit
to brechtvl/OpenShadingLanguage
that referenced
this pull request
Oct 2, 2023
In AcademySoftwareFoundation#1668 USE_OPTIX changed to OSL_USE_OPTIX, but CI was not updated. Signed-off-by: Brecht Van Lommel <brecht@blender.org>
5 tasks
lgritz
pushed a commit
that referenced
this pull request
Oct 3, 2023
In #1668 USE_OPTIX changed to OSL_USE_OPTIX, but CI was not updated. Also fix use of CPU SIMD flags for compiling CUDA bitcode --------- Signed-off-by: Brecht Van Lommel <brecht@blender.org>
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.
This avoids some possible confusion with other projects, or if this is built as a subproject.
Also, change from the C++ side having an OSL_USE_OPTIX defined -- only when building OSL itself -- to having it always defined in oslconfig.h and set to 0 or 1 depending on whether OptiX support was turned on at build time. This allows app-side use of OSL headers to know if it's dealing with an OptiX-capable OSL build.