sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: cmake changes to make win32 use lib/windows for boost and openimageio.

Browse Source
This commit is contained in:
Brecht Van Lommel 2011-06-29 19:18:08 +00:00
parent b1637e3201
commit b57c87856d
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
intern/cycles/cmake/external_libs.cmake
View File

@ -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
@ -11,7 +26,7 @@ SET(Boost_ADDITIONAL_VERSIONS "1.45" "1.44"
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 version ${Boost_VERSION}")