diff options
| author | Fabian Maurer | 2019-08-11 17:28:24 +0200 |
|---|---|---|
| committer | Fabian Maurer | 2019-08-11 17:28:24 +0200 |
| commit | b3c44c3f6e56864474e693eb58738d0944a61b96 (patch) | |
| tree | 36629aab75a3ee51af0592ef86a95461d21c5e17 /fix-dependencies.patch | |
| parent | 7fd1d40777b98a6eb7eb9e047ce9f0c5dde5d75c (diff) | |
| download | aur-b3c44c3f6e56864474e693eb58738d0944a61b96.tar.gz | |
Update to 4.0alpha0
Diffstat (limited to 'fix-dependencies.patch')
| -rw-r--r-- | fix-dependencies.patch | 50 |
1 files changed, 9 insertions, 41 deletions
diff --git a/fix-dependencies.patch b/fix-dependencies.patch index 3f8f1f968167..59e28d822430 100644 --- a/fix-dependencies.patch +++ b/fix-dependencies.patch @@ -1,45 +1,13 @@ -From 5c2a8f2c08c8c5bdc6789be5c64e37397cec9a7c Mon Sep 17 00:00:00 2001 -From: Fabian Maurer <dark.shadow4@web.de> -Date: Sat, 12 Jan 2019 13:18:07 +0100 -Subject: [PATCH] fix dependencies - ---- - cmake/Packages/FindEmbree.cmake | 4 ++-- - src/CMakeLists.txt | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/cmake/Packages/FindEmbree.cmake b/cmake/Packages/FindEmbree.cmake -index 6ff74ca..c2e6b51 100644 ---- a/cmake/Packages/FindEmbree.cmake -+++ b/cmake/Packages/FindEmbree.cmake -@@ -14,13 +14,13 @@ - ## limitations under the License. ## - ## ======================================================================== ## - --FIND_PATH(EMBREE_INCLUDE_PATH embree2/rtcore.h -+FIND_PATH(EMBREE_INCLUDE_PATH embree3/rtcore.h - /usr/include - /usr/local/include - /opt/local/include - ${EMBREE_ROOT}/include) - --FIND_LIBRARY(EMBREE_LIBRARY NAMES embree libembree.so.2 PATHS -+FIND_LIBRARY(EMBREE_LIBRARY libembree3.so - /usr/lib - /usr/local/lib - /opt/local/lib -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4043b68..e9041a7 100644 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23b2230..c9b1bed 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -143,6 +143,7 @@ ELSE(APPLE) - ADD_EXECUTABLE(luxmark ${LUXMARK_SRCS}) +@@ -102,6 +102,7 @@ set(LUXMARK_SRCS + ADD_EXECUTABLE(luxmark WIN32 ${LUXMARK_SRCS}) - TARGET_LINK_LIBRARIES(luxmark ${LUXCORE_LIBRARY} ${SLG_LIBRARY} ${LUXRAYS_LIBRARY} ${EMBREE_LIBRARY} ${Boost_LIBRARIES} ${QT_LIBRARIES} ${QT_QTNETWORK_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENCL_LIBRARIES} ${OPENIMAGEIO_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES}) -+ TARGET_LINK_LIBRARIES(luxmark tbb bcd.a openvdb.a boost_iostreams OpenImageDenoise) - - # This instructs FREEGLUT to emit a pragma for the static version - SET_TARGET_PROPERTIES(luxmark PROPERTIES COMPILE_DEFINITIONS FREEGLUT_STATIC) --- -2.20.1 + TARGET_LINK_LIBRARIES(luxmark ${ALL_LUXCORE_LIBRARIES} ${Boost_LIBRARIES} ${Qt5_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENCL_LIBRARIES}) ++TARGET_LINK_LIBRARIES(luxmark openvdb.a OpenImageIO python2.7) + if (WIN32) + # This is needed by Boost 1.67 but is not found automatically + TARGET_LINK_LIBRARIES(luxmark bcrypt.lib) |