Skip to content

Commit fdad2d5

Browse files
committed
Move find_packages to LuxCore
1 parent 9f24b1e commit fdad2d5

File tree

1 file changed

+1
-87
lines changed

1 file changed

+1
-87
lines changed

CMakeLists.txt

Lines changed: 1 addition & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ cmake_print_variables(CMAKE_BUILD_TYPE)
1313
cmake_print_variables(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT)
1414
cmake_print_variables(CMAKE_CXX_FLAGS)
1515

16-
set(CMAKE_CXX_STANDARD $ENV{CXX_VERSION})
17-
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1816
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
1917
set(CMAKE_INSTALL_NAME_DIR "$ENV{CMAKE_INSTALL_NAME_DIR}")
2018
set(BUILD_LUXCORE_DLL 1)
@@ -24,69 +22,7 @@ set(LUXRAYS_ENABLE_OPTIX TRUE)
2422
unset(LUXRAYS_DISABLE_OPENCL)
2523
unset(LUXRAYS_DISABLE_CUDA)
2624
unset(LUXRAYS_DISABLE_OPTIX)
27-
cmake_policy(SET CMP0074 NEW) # *_ROOT variable
28-
29-
## Python
30-
#MESSAGE(STATUS "LuxCoreWheel - Python_ROOT_DIR: ${Python_ROOT_DIR}")
31-
#find_package(Python COMPONENTS Interpreter Development.Module REQUIRED)
32-
33-
#message(STATUS "LuxCoreWheel - Add conan targets")
34-
#find_package(OpenMP REQUIRED) # TODO
35-
#find_package(TBB REQUIRED)
36-
#find_package(minizip REQUIRED)
37-
#find_package(spdlog REQUIRED)
38-
#find_package(OpenImageIO REQUIRED)
39-
#find_package(PNG REQUIRED)
40-
#find_package(OpenColorIO REQUIRED)
41-
#find_package(OpenEXR REQUIRED)
42-
#find_package(embree REQUIRED)
43-
#find_package(Blosc REQUIRED)
44-
#find_package(oidn REQUIRED)
45-
##find_package(Boost_python REQUIRED) # TODO
46-
#find_package(Boost REQUIRED)
47-
#find_package(OpenVDB REQUIRED)
48-
#find_package(Imath REQUIRED)
49-
#find_package(Eigen3 REQUIRED)
50-
#find_package(blender-types REQUIRED)
51-
#find_package(OpenSubdiv REQUIRED)
52-
#find_package(nlohmann_json REQUIRED)
53-
#find_package(robin_hood REQUIRED)
54-
#find_package(pybind11 CONFIG REQUIRED)
55-
56-
## Bison/Flex
57-
#find_package(BISON REQUIRED)
58-
#find_package(FLEX REQUIRED)
59-
60-
## If we are here, it means we have found all dependencies
61-
## So let's tell LuxCore all is ok
62-
#set(OPENIMAGEIO_FOUND TRUE)
63-
#set(EMBREE_FOUND TRUE)
64-
#set(OIDN_FOUND TRUE)
65-
#set(BLOSC_FOUND TRUE)
66-
67-
#if(APPLE)
68-
## OpenMP
69-
#find_package(OpenMP REQUIRED)
70-
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fopenmp -Wno-register")
71-
#endif(APPLE)
72-
73-
#if(LINUX)
74-
#set(OpenGL_GL_PREFERENCE "LEGACY")
75-
#endif(LINUX)
76-
77-
#if(MSVC)
78-
## Minimizes Windows header files
79-
##ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)
80-
## Do not define MIN and MAX macros
81-
#ADD_DEFINITIONS(-DNOMINMAX)
82-
## Do not warn about standard but insecure functions
83-
#ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
84-
## Enable Unicode
85-
#ADD_DEFINITIONS(-D_UNICODE)
86-
## Enable SSE2/SSE/MMX
87-
#ADD_DEFINITIONS(-D__SSE2__ -D__SSE__ -D__MMX__)
88-
#add_link_options("/INCREMENTAL:NO" "/PDBALTPATH:%_PDB%")
89-
#endif(MSVC)
25+
9026

9127
# Add LuxCore
9228
add_subdirectory(LuxCore)
@@ -128,30 +64,8 @@ if ((DEFINED ENV{SANITIZE}) AND LINUX)
12864
set(HAVE_SANITIZER TRUE)
12965
endif()
13066

131-
#target_link_libraries(pyluxcore PRIVATE
132-
#$<$<BOOL:${HAVE_SANITIZER}>:asan>
133-
#slg-core
134-
#slg-film
135-
#slg-kernels
136-
#luxrays
137-
#bcd
138-
#OpenVDB::openvdb
139-
#spdlog::spdlog_header_only
140-
#pybind11::pybind11
141-
#Python::Module
142-
#boost::boost
143-
#onetbb::onetbb
144-
#blender-types
145-
#robin_hood::robin_hood
146-
#)
147-
# TODO
148-
#set_property(TARGET pyluxcore PROPERTY CXX_STANDARD 17)
149-
150-
#target_link_options(pyluxcore PRIVATE $<$<BOOL:${HAVE_SANITIZER}>:-fsanitize=address>)
15167

15268
if(APPLE)
153-
# TODO
154-
#target_link_libraries(opensubdiv PRIVATE llvm-openmp::llvm-openmp)
15569
target_link_libraries(bcd PRIVATE llvm-openmp::llvm-openmp)
15670
target_link_libraries(slg-core PRIVATE llvm-openmp::llvm-openmp)
15771
target_link_libraries(pyluxcore PRIVATE llvm-openmp::llvm-openmp)

0 commit comments

Comments
 (0)