summarylogtreecommitdiffstats
path: root/fix-dependencies.patch
blob: 5e142d4f30112b761688af60ceb80318336cf095 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4de71e3..d7a0e98 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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} ${CMAKE_DL_LIBS})
+TARGET_LINK_LIBRARIES(luxmark opensubdiv.a openvdb.a OpenImageIO python3 blosc dl Imath)
 
 if (WIN32)
 	# This is needed by Boost 1.67 but is not found automatically

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)
diff --git a/cmake/Packages/FindOpenEXR.cmake b/cmake/Packages/FindOpenEXR.cmake
index 7bbd7a0..34ab35e 100644
--- a/cmake/Packages/FindOpenEXR.cmake
+++ b/cmake/Packages/FindOpenEXR.cmake
@@ -43,7 +43,7 @@ FIND_PATH(OPENEXR_INCLUDE_DIRS
 
 IF (OPENEXR_INCLUDE_DIRS)
 # Lookup additional headers in case they are in subdirectories
-SET(OpenEXR_MODULES Iex Imf half Imath IlmThread)
+SET(OpenEXR_MODULES Iex Imf IlmThread)
 FOREACH(i ${OpenEXR_MODULES})
 	FIND_PATH(OpenEXR_${i}_INCLUDE_DIR
 		NAMES ${i}.h ${i}Header.h ${i}Math.h
@@ -65,7 +65,7 @@ FOREACH(i ${OpenEXR_MODULES})
 ENDFOREACH(i)
 ENDIF(OPENEXR_INCLUDE_DIRS)
 
-SET(OpenEXR_LIBRARY_MODULES Iex IlmImf Half Imath IlmThread)
+SET(OpenEXR_LIBRARY_MODULES Iex IlmImf IlmThread)
 SET(OpenEXR_LIB_SUFFIXES lib64 lib Lib lib/OpenEXR Libs x64/Release/lib)
 SET(OpenEXR_LIB_SUFFIXES_REL)
 SET(OpenEXR_LIB_SUFFIXES_DBG)