forked from bartvdbraak/blender
Cycles: cmake changes to make win32 use lib/windows for boost and openimageio.
This commit is contained in:
parent
b1637e3201
commit
b57c87856d
@ -1,3 +1,18 @@
|
|||||||
|
###########################################################################
|
||||||
|
# Windows lib directory libraries
|
||||||
|
|
||||||
|
IF(WIN32)
|
||||||
|
if(CMAKE_CL_64)
|
||||||
|
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
|
||||||
|
else()
|
||||||
|
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
SET(CYCLES_OIIO ${LIBDIR}/openimageio)
|
||||||
|
SET(CYCLES_BOOST ${LIBDIR}/boost)
|
||||||
|
SET(Boost_USE_STATIC_LIBS ON)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
# Boost setup
|
# Boost setup
|
||||||
|
|
||||||
@ -11,7 +26,7 @@ SET(Boost_ADDITIONAL_VERSIONS "1.45" "1.44"
|
|||||||
|
|
||||||
SET(Boost_USE_MULTITHREADED ON)
|
SET(Boost_USE_MULTITHREADED ON)
|
||||||
|
|
||||||
FIND_PACKAGE(Boost 1.34 REQUIRED COMPONENTS filesystem regex system serialization thread)
|
FIND_PACKAGE(Boost 1.34 REQUIRED COMPONENTS filesystem regex system thread)
|
||||||
|
|
||||||
MESSAGE(STATUS "Boost found ${Boost_FOUND}")
|
MESSAGE(STATUS "Boost found ${Boost_FOUND}")
|
||||||
MESSAGE(STATUS "Boost version ${Boost_VERSION}")
|
MESSAGE(STATUS "Boost version ${Boost_VERSION}")
|
||||||
|
Loading…
Reference in New Issue
Block a user