Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fully split oslquery and oslnoise libraries from oslexec #1346

Merged
merged 1 commit into from
Mar 12, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/liboslexec/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,16 @@ set (lib_src
batched_backendllvm.cpp
batched_llvm_gen.cpp
batched_llvm_instance.cpp
../liboslnoise/gabornoise.cpp
../liboslnoise/simplexnoise.cpp
)

if (BUILD_SHARED_LIBS)
# oslcomp and oslquery symbols used in oslexec
# oslcomp symbols used in oslexec
list(APPEND lib_src
../liboslcomp/ast.cpp
../liboslcomp/codegen.cpp
../liboslcomp/oslcomp.cpp
../liboslcomp/symtab.cpp
../liboslcomp/typecheck.cpp
../liboslquery/oslquery.cpp
)
endif ()

Expand Down Expand Up @@ -222,6 +219,7 @@ endif()

target_link_libraries (${local_lib}
PUBLIC
oslquery oslnoise
OpenImageIO::OpenImageIO
# For OpenEXR/Imath 3.x:
$<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
Expand Down