|
 |
d2b662d |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
d2b662d |
index a4a073f2e..4025bc894 100644
|
|
|
d2b662d |
--- a/CMakeLists.txt
|
|
|
d2b662d |
+++ b/CMakeLists.txt
|
|
|
d2b662d |
@@ -28,6 +28,10 @@ MESSAGE(STATUS "CMake version " ${CMAKE_VERSION} " detected")
|
|
|
d2b662d |
cmake_minimum_required(VERSION 3.5.1)
|
|
|
d2b662d |
cmake_policy(VERSION 3.0)
|
|
|
d2b662d |
|
|
|
d2b662d |
+if(POLICY CMP0072)
|
|
|
d2b662d |
+ cmake_policy(SET CMP0072 OLD)
|
|
|
d2b662d |
+endif()
|
|
|
d2b662d |
+
|
|
|
d2b662d |
# Remove the following when the version check is at least 2.8.4
|
|
|
d2b662d |
SET(CMAKE_LEGACY_CYGWIN_WIN32 0)
|
|
|
d2b662d |
|
|
|
d2b662d |
diff --git a/samples/luxcoreconsole/CMakeLists.txt b/samples/luxcoreconsole/CMakeLists.txt
|
|
|
d2b662d |
index dc3f5d8cf..a8b429814 100644
|
|
|
d2b662d |
--- a/samples/luxcoreconsole/CMakeLists.txt
|
|
|
d2b662d |
+++ b/samples/luxcoreconsole/CMakeLists.txt
|
|
|
d2b662d |
@@ -28,4 +28,4 @@ set(LUXCORECONSOLE_SRCS
|
|
|
d2b662d |
|
|
|
d2b662d |
add_executable(luxcoreconsole ${LUXCORECONSOLE_SRCS})
|
|
|
d2b662d |
|
|
|
d2b662d |
-TARGET_LINK_LIBRARIES(luxcoreconsole ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES})
|
|
|
d2b662d |
\ No newline at end of file
|
|
|
d2b662d |
+TARGET_LINK_LIBRARIES(luxcoreconsole ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES})
|
|
|
d2b662d |
diff --git a/samples/luxcoredemo/CMakeLists.txt b/samples/luxcoredemo/CMakeLists.txt
|
|
|
d2b662d |
index c140dc23b..c8cba9880 100644
|
|
|
d2b662d |
--- a/samples/luxcoredemo/CMakeLists.txt
|
|
|
d2b662d |
+++ b/samples/luxcoredemo/CMakeLists.txt
|
|
|
d2b662d |
@@ -29,4 +29,4 @@ set(LUXCORELIBDEMO_SRCS
|
|
|
d2b662d |
add_executable(luxcoredemo ${LUXCORELIBDEMO_SRCS})
|
|
|
d2b662d |
add_definitions(${VISIBILITY_FLAGS})
|
|
|
d2b662d |
|
|
|
d2b662d |
-TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES})
|
|
|
d2b662d |
+TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES})
|
|
|
d2b662d |
diff --git a/samples/luxcorescenedemo/CMakeLists.txt b/samples/luxcorescenedemo/CMakeLists.txt
|
|
|
d2b662d |
index 90c1967cd..aa024f650 100644
|
|
|
d2b662d |
--- a/samples/luxcorescenedemo/CMakeLists.txt
|
|
|
d2b662d |
+++ b/samples/luxcorescenedemo/CMakeLists.txt
|
|
|
d2b662d |
@@ -29,4 +29,4 @@ set(LUXCORESCENEDEMO_SRCS
|
|
|
d2b662d |
add_executable(luxcorescenedemo ${LUXCORESCENEDEMO_SRCS})
|
|
|
d2b662d |
add_definitions(${VISIBILITY_FLAGS})
|
|
|
d2b662d |
|
|
|
d2b662d |
-TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES})
|
|
|
d2b662d |
+TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES})
|
|
|
d2b662d |
diff --git a/samples/luxcoreui/CMakeLists.txt b/samples/luxcoreui/CMakeLists.txt
|
|
|
d2b662d |
index 33b50b3d0..ba1982a42 100644
|
|
|
d2b662d |
--- a/samples/luxcoreui/CMakeLists.txt
|
|
|
d2b662d |
+++ b/samples/luxcoreui/CMakeLists.txt
|
|
|
d2b662d |
@@ -88,4 +91,5 @@ TARGET_LINK_LIBRARIES(luxcoreui
|
|
|
d2b662d |
${OPENGL_LIBRARIES}
|
|
|
d2b662d |
${GTK3_LIBRARIES}
|
|
|
d2b662d |
${Boost_LIBRARIES}
|
|
|
d2b662d |
+ ${PYTHON_LIBRARIES}
|
|
|
d2b662d |
${OPENCL_LIBRARIES})
|
|
|
d2b662d |
diff --git a/tests/benchsimple/CMakeLists.txt b/tests/benchsimple/CMakeLists.txt
|
|
|
d2b662d |
index 3ac004b2b..b2abe340c 100644
|
|
|
d2b662d |
--- a/tests/benchsimple/CMakeLists.txt
|
|
|
d2b662d |
+++ b/tests/benchsimple/CMakeLists.txt
|
|
|
d2b662d |
@@ -22,4 +22,4 @@ link_directories (${LuxRays_LIB_DIR})
|
|
|
d2b662d |
add_executable(benchsimple benchsimple.cpp)
|
|
|
d2b662d |
add_definitions(${VISIBILITY_FLAGS})
|
|
|
d2b662d |
remove_definitions("-DLUXCORE_DLL")
|
|
|
d2b662d |
-target_link_libraries(benchsimple luxrays ${EMBREE_LIBRARY} ${TBB_LIBRARY} )
|
|
|
d2b662d |
+target_link_libraries(benchsimple luxrays ${EMBREE_LIBRARY} ${PYTHON_LIBRARIES} ${TBB_LIBRARY} )
|
|
|
d2b662d |
diff --git a/tests/luxcoreimplserializationdemo/CMakeLists.txt b/tests/luxcoreimplserializationdemo/CMakeLists.txt
|
|
|
d2b662d |
index c8d9c4aa9..1dc6b7c63 100644
|
|
|
d2b662d |
--- a/tests/luxcoreimplserializationdemo/CMakeLists.txt
|
|
|
d2b662d |
+++ b/tests/luxcoreimplserializationdemo/CMakeLists.txt
|
|
|
d2b662d |
@@ -30,4 +30,4 @@ include_directories(${LuxRays_SOURCE_DIR}/deps/bcd-1.1/include)
|
|
|
d2b662d |
|
|
|
d2b662d |
add_executable(luxcoreimplserializationdemo ${LUXCOREIMPL_SERIALIZATIONDEMO_SRCS})
|
|
|
d2b662d |
|
|
|
d2b662d |
-TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd openvdb ${BLOSC_LIBRARIES} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
|
|
|
d2b662d |
+TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd openvdb ${BLOSC_LIBRARIES} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${PYTHON_LIBRARIES} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
|