From a6fbe12e4031aea2a23088ec1ec224dbe84a19af Mon Sep 17 00:00:00 2001 From: howetuft Date: Sat, 21 May 2022 18:17:31 +0200 Subject: [PATCH 06/14] python --- CMakeLists.txt | 4 ++++ samples/luxcoreconsole/CMakeLists.txt | 2 +- samples/luxcoredemo/CMakeLists.txt | 2 +- samples/luxcorescenedemo/CMakeLists.txt | 2 +- samples/luxcoreui/CMakeLists.txt | 3 ++- tests/luxcoreimplserializationdemo/CMakeLists.txt | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a266db8f2..393a1cbaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,10 @@ MESSAGE(STATUS "CMake version " ${CMAKE_VERSION} " detected") cmake_minimum_required(VERSION 3.5.1) cmake_policy(VERSION 3.0) +if(POLICY CMP0072) + cmake_policy(SET CMP0072 OLD) +endif() + # Remove the following when the version check is at least 2.8.4 SET(CMAKE_LEGACY_CYGWIN_WIN32 0) diff --git a/samples/luxcoreconsole/CMakeLists.txt b/samples/luxcoreconsole/CMakeLists.txt index 96e09bc6a..cdb83231c 100644 --- a/samples/luxcoreconsole/CMakeLists.txt +++ b/samples/luxcoreconsole/CMakeLists.txt @@ -31,5 +31,5 @@ add_executable(luxcoreconsole ${LUXCORECONSOLE_SRCS}) if(APPLE) TARGET_LINK_LIBRARIES(luxcoreconsole expat "-framework Carbon" "-framework IOKit" ${LUXCORE_LIBRARY} ${Boost_LIBRARIES}) else() -TARGET_LINK_LIBRARIES(luxcoreconsole ${LUXCORE_LIBRARY} ${Boost_LIBRARIES}) +TARGET_LINK_LIBRARIES(luxcoreconsole ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) endif() diff --git a/samples/luxcoredemo/CMakeLists.txt b/samples/luxcoredemo/CMakeLists.txt index 194104caf..241dbd5f2 100644 --- a/samples/luxcoredemo/CMakeLists.txt +++ b/samples/luxcoredemo/CMakeLists.txt @@ -29,4 +29,4 @@ set(LUXCORELIBDEMO_SRCS add_executable(luxcoredemo ${LUXCORELIBDEMO_SRCS}) add_definitions(${VISIBILITY_FLAGS}) -TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${CUDA_ALL_LIBRARIES}) +TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES} ${CUDA_ALL_LIBRARIES}) diff --git a/samples/luxcorescenedemo/CMakeLists.txt b/samples/luxcorescenedemo/CMakeLists.txt index 1840a0e42..504739572 100644 --- a/samples/luxcorescenedemo/CMakeLists.txt +++ b/samples/luxcorescenedemo/CMakeLists.txt @@ -29,4 +29,4 @@ set(LUXCORESCENEDEMO_SRCS add_executable(luxcorescenedemo ${LUXCORESCENEDEMO_SRCS}) add_definitions(${VISIBILITY_FLAGS}) -TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES}) +TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) diff --git a/samples/luxcoreui/CMakeLists.txt b/samples/luxcoreui/CMakeLists.txt index d2e823874..80325af7e 100644 --- a/samples/luxcoreui/CMakeLists.txt +++ b/samples/luxcoreui/CMakeLists.txt @@ -103,5 +103,6 @@ TARGET_LINK_LIBRARIES(luxcoreui ${LUXCORE_LIBRARY} ${OPENGL_LIBRARIES} ${GTK3_LIBRARIES} - ${Boost_LIBRARIES}) + ${Boost_LIBRARIES} + ${PYTHON_LIBRARIES}) endif() diff --git a/tests/luxcoreimplserializationdemo/CMakeLists.txt b/tests/luxcoreimplserializationdemo/CMakeLists.txt index bdd3445b8..baa52f622 100644 --- a/tests/luxcoreimplserializationdemo/CMakeLists.txt +++ b/tests/luxcoreimplserializationdemo/CMakeLists.txt @@ -31,4 +31,4 @@ include_directories(${LuxRays_SOURCE_DIR}/deps/opencolorio-2.0.0/include) add_executable(luxcoreimplserializationdemo ${LUXCOREIMPL_SERIALIZATIONDEMO_SRCS}) -TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv openvdb opencolorio ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES}) \ No newline at end of file +TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv openvdb ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES}) -- 2.43.0