diff options
| author | Fabian Maurer | 2021-01-06 05:57:01 +0100 |
|---|---|---|
| committer | Fabian Maurer | 2021-01-06 06:43:17 +0100 |
| commit | d2bac2adf4c96aafea44e2140d4dc9b8990930fd (patch) | |
| tree | b3056a59dd3abe13077d962a2e5702e26c3c634b /fix-dependencies.patch | |
| parent | 5eb2a12ded3e3d6e3f19b5eacca44f8adc4ca980 (diff) | |
| download | aur-d2bac2adf4c96aafea44e2140d4dc9b8990930fd.tar.gz | |
Update to 4.0alpha1
Diffstat (limited to 'fix-dependencies.patch')
| -rw-r--r-- | fix-dependencies.patch | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/fix-dependencies.patch b/fix-dependencies.patch index 7b8e22a25086..c3ad8998c839 100644 --- a/fix-dependencies.patch +++ b/fix-dependencies.patch @@ -2,12 +2,29 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 23b2230..c9b1bed 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -102,6 +102,7 @@ set(LUXMARK_SRCS +@@ -115,6 +115,7 @@ set(LUXMARK_SRCS ADD_EXECUTABLE(luxmark WIN32 ${LUXMARK_SRCS}) - TARGET_LINK_LIBRARIES(luxmark ${ALL_LUXCORE_LIBRARIES} ${Boost_LIBRARIES} ${Qt5_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENCL_LIBRARIES}) + TARGET_LINK_LIBRARIES(luxmark ${ALL_LUXCORE_LIBRARIES} ${Boost_LIBRARIES} ${Qt5_LIBRARIES} ${OPENGL_gl_LIBRARY} ${CMAKE_DL_LIBS}) +TARGET_LINK_LIBRARIES(luxmark opensubdiv.a openvdb.a OpenImageIO python3 blosc dl) + if (WIN32) # This is needed by Boost 1.67 but is not found automatically - TARGET_LINK_LIBRARIES(luxmark bcrypt.lib) +diff --git a/cmake/Packages/FindOidn.cmake b/cmake/Packages/FindOidn.cmake +index 3544698..be202b4 100644 +--- a/cmake/Packages/FindOidn.cmake ++++ b/cmake/Packages/FindOidn.cmake +@@ -14,10 +14,10 @@ + ## limitations under the License. ## + ## ======================================================================== ## + +-FIND_PATH(OIDN_INCLUDE_PATH NAMES OpenImageDenoise/version.h PATHS ++FIND_PATH(OIDN_INCLUDE_PATH NAMES OpenImageDenoise/oidn.h PATHS + ${OIDN_ROOT}/include) + IF (NOT OIDN_INCLUDE_PATH) +- FIND_PATH(OIDN_INCLUDE_PATH NAMES OpenImageDenoise/version.h PATHS ++ FIND_PATH(OIDN_INCLUDE_PATH NAMES OpenImageDenoise/oidn.h PATHS + /usr/include + /usr/local/include + /opt/local/include)
\ No newline at end of file |