|
 |
f6bd46f |
diff -Naur orig/LuxCore-luxcorerender_v2.0/cmake/Dependencies.cmake LuxCore-luxcorerender_v2.0/cmake/Dependencies.cmake
|
|
|
f6bd46f |
--- orig/LuxCore-luxcorerender_v2.0/cmake/Dependencies.cmake 2018-05-06 11:04:25.000000000 +0200
|
|
|
f6bd46f |
+++ LuxCore-luxcorerender_v2.0/cmake/Dependencies.cmake 2018-05-11 16:22:01.774281916 +0200
|
|
|
f6bd46f |
@@ -43,7 +43,7 @@
|
|
|
f6bd46f |
find_package(PNG REQUIRED)
|
|
|
f6bd46f |
include_directories(BEFORE SYSTEM ${PNG_PNG_INCLUDE_DIR})
|
|
|
f6bd46f |
# Find Python Libraries
|
|
|
f6bd46f |
- find_package(PythonLibs 3.4)
|
|
|
f6bd46f |
+ find_package(PythonLibs)
|
|
|
f6bd46f |
endif()
|
|
|
f6bd46f |
|
|
|
f6bd46f |
find_program(PYSIDE_UIC NAME pyside-uic
|
|
|
f6bd46f |
diff -Naur orig/LuxCore-luxcorerender_v2.0/CMakeLists.txt LuxCore-luxcorerender_v2.0/CMakeLists.txt
|
|
|
f6bd46f |
--- orig/LuxCore-luxcorerender_v2.0/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
|
|
|
f6bd46f |
+++ LuxCore-luxcorerender_v2.0/CMakeLists.txt 2018-05-11 16:30:33.742293724 +0200
|
|
|
f6bd46f |
@@ -28,6 +28,10 @@
|
|
|
f6bd46f |
cmake_minimum_required(VERSION 3.5.1)
|
|
|
f6bd46f |
cmake_policy(VERSION 3.0)
|
|
|
f6bd46f |
|
|
|
f6bd46f |
+if(POLICY CMP0072)
|
|
|
f6bd46f |
+ cmake_policy(SET CMP0072 OLD)
|
|
|
f6bd46f |
+endif()
|
|
|
f6bd46f |
+
|
|
|
f6bd46f |
# Remove the following when the version check is at least 2.8.4
|
|
|
f6bd46f |
SET(CMAKE_LEGACY_CYGWIN_WIN32 0)
|
|
|
f6bd46f |
|
|
|
f6bd46f |
diff -Naur orig/LuxCore-luxcorerender_v2.0/samples/luxcoreconsole/CMakeLists.txt LuxCore-luxcorerender_v2.0/samples/luxcoreconsole/CMakeLists.txt
|
|
|
f6bd46f |
--- orig/LuxCore-luxcorerender_v2.0/samples/luxcoreconsole/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
|
|
|
f6bd46f |
+++ LuxCore-luxcorerender_v2.0/samples/luxcoreconsole/CMakeLists.txt 2018-05-11 16:22:01.774281916 +0200
|
|
|
f6bd46f |
@@ -28,4 +28,4 @@
|
|
|
f6bd46f |
|
|
|
f6bd46f |
add_executable(luxcoreconsole ${LUXCORECONSOLE_SRCS})
|
|
|
f6bd46f |
|
|
|
f6bd46f |
-TARGET_LINK_LIBRARIES(luxcoreconsole ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES})
|
|
|
f6bd46f |
\ Brak znaku nowej linii na końcu pliku
|
|
|
f6bd46f |
+TARGET_LINK_LIBRARIES(luxcoreconsole ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES})
|
|
|
f6bd46f |
diff -Naur orig/LuxCore-luxcorerender_v2.0/samples/luxcoredemo/CMakeLists.txt LuxCore-luxcorerender_v2.0/samples/luxcoredemo/CMakeLists.txt
|
|
|
f6bd46f |
--- orig/LuxCore-luxcorerender_v2.0/samples/luxcoredemo/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
|
|
|
f6bd46f |
+++ LuxCore-luxcorerender_v2.0/samples/luxcoredemo/CMakeLists.txt 2018-05-11 16:22:01.774281916 +0200
|
|
|
f6bd46f |
@@ -29,4 +29,4 @@
|
|
|
f6bd46f |
add_executable(luxcoredemo ${LUXCORELIBDEMO_SRCS})
|
|
|
f6bd46f |
add_definitions(${VISIBILITY_FLAGS})
|
|
|
f6bd46f |
|
|
|
f6bd46f |
-TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES})
|
|
|
f6bd46f |
+TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES})
|
|
|
f6bd46f |
diff -Naur orig/LuxCore-luxcorerender_v2.0/samples/luxcorescenedemo/CMakeLists.txt LuxCore-luxcorerender_v2.0/samples/luxcorescenedemo/CMakeLists.txt
|
|
|
f6bd46f |
--- orig/LuxCore-luxcorerender_v2.0/samples/luxcorescenedemo/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
|
|
|
f6bd46f |
+++ LuxCore-luxcorerender_v2.0/samples/luxcorescenedemo/CMakeLists.txt 2018-05-11 16:22:01.774281916 +0200
|
|
|
f6bd46f |
@@ -29,4 +29,4 @@
|
|
|
f6bd46f |
add_executable(luxcorescenedemo ${LUXCORESCENEDEMO_SRCS})
|
|
|
f6bd46f |
add_definitions(${VISIBILITY_FLAGS})
|
|
|
f6bd46f |
|
|
|
f6bd46f |
-TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES})
|
|
|
f6bd46f |
+TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES})
|
|
|
f6bd46f |
diff -Naur orig/LuxCore-luxcorerender_v2.0/samples/luxcoreui/CMakeLists.txt LuxCore-luxcorerender_v2.0/samples/luxcoreui/CMakeLists.txt
|
|
|
f6bd46f |
--- orig/LuxCore-luxcorerender_v2.0/samples/luxcoreui/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
|
|
|
f6bd46f |
+++ LuxCore-luxcorerender_v2.0/samples/luxcoreui/CMakeLists.txt 2018-05-11 16:22:01.774281916 +0200
|
|
|
f6bd46f |
@@ -88,4 +88,5 @@
|
|
|
f6bd46f |
${OPENGL_LIBRARIES}
|
|
|
f6bd46f |
${GTK3_LIBRARIES}
|
|
|
f6bd46f |
${Boost_LIBRARIES}
|
|
|
f6bd46f |
+ ${PYTHON_LIBRARIES}
|
|
|
f6bd46f |
${OPENCL_LIBRARIES})
|
|
|
f6bd46f |
diff -Naur orig/LuxCore-luxcorerender_v2.0/tests/benchsimple/CMakeLists.txt LuxCore-luxcorerender_v2.0/tests/benchsimple/CMakeLists.txt
|
|
|
f6bd46f |
--- orig/LuxCore-luxcorerender_v2.0/tests/benchsimple/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
|
|
|
f6bd46f |
+++ LuxCore-luxcorerender_v2.0/tests/benchsimple/CMakeLists.txt 2018-05-11 16:22:01.774281916 +0200
|
|
|
f6bd46f |
@@ -22,4 +22,4 @@
|
|
|
f6bd46f |
add_executable(benchsimple benchsimple.cpp)
|
|
|
f6bd46f |
add_definitions(${VISIBILITY_FLAGS})
|
|
|
f6bd46f |
remove_definitions("-DLUXCORE_DLL")
|
|
|
f6bd46f |
-target_link_libraries(benchsimple luxrays ${EMBREE_LIBRARY} ${TBB_LIBRARY} )
|
|
|
f6bd46f |
+target_link_libraries(benchsimple luxrays ${EMBREE_LIBRARY} ${PYTHON_LIBRARIES} ${TBB_LIBRARY} )
|
|
|
f6bd46f |
diff -Naur orig/LuxCore-luxcorerender_v2.0/tests/luxcoreimplserializationdemo/CMakeLists.txt LuxCore-luxcorerender_v2.0/tests/luxcoreimplserializationdemo/CMakeLists.txt
|
|
|
f6bd46f |
--- orig/LuxCore-luxcorerender_v2.0/tests/luxcoreimplserializationdemo/CMakeLists.txt 2018-05-06 11:04:25.000000000 +0200
|
|
|
f6bd46f |
+++ LuxCore-luxcorerender_v2.0/tests/luxcoreimplserializationdemo/CMakeLists.txt 2018-05-11 16:22:01.774281916 +0200
|
|
|
f6bd46f |
@@ -30,4 +30,4 @@
|
|
|
f6bd46f |
|
|
|
f6bd46f |
add_executable(luxcoreimplserializationdemo ${LUXCOREIMPL_SERIALIZATIONDEMO_SRCS})
|
|
|
f6bd46f |
|
|
|
f6bd46f |
-TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd openvdb ${BLOSC_LIBRARIES} ${EMBREE_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
|
|
|
f6bd46f |
+TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd openvdb ${BLOSC_LIBRARIES} ${EMBREE_LIBRARY} ${PYTHON_LIBRARIES} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
|