Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: more linux build system tweaks, attempting to avoid using boost

Browse Source 
system libraries by default if we have a lib/ directory.
This commit is contained in:
Brecht Van Lommel
2011-11-11 20:57:00 +00:00
parent 38fd8c0e22
commit 0f85990d4a
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@@ -524,14 +524,15 @@ if(UNIX AND NOT APPLE)
endif() endif()
if(WITH_BOOST) if(WITH_BOOST)
# use lib dir if available and nothing else specified
if(LIBDIR AND NOT BOOST_ROOT)
set(BOOST_ROOT ${LIBDIR}/boost)
endif()
# uses in build instructions to override include and library variables # uses in build instructions to override include and library variables
if(NOT BOOST_CUSTOM) if(NOT BOOST_CUSTOM)
set(Boost_USE_MULTITHREADED ON) # use lib dir if available and nothing else specified
if(LIBDIR AND NOT BOOST_ROOT)
set(BOOST_ROOT ${LIBDIR}/boost)
set(Boost_USE_MULTITHREADED OFF)
else()
set(Boost_USE_MULTITHREADED ON)
endif()
find_package(Boost 1.34 COMPONENTS filesystem regex system thread) find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
mark_as_advanced(Boost_DIR) # why doesnt boost do this? mark_as_advanced(Boost_DIR) # why doesnt boost do this?
endif() endif()

2
build_files/scons/config/linux-config.py
View File

@@ -211,7 +211,7 @@ if not os.path.exists(LCGDIR + '/boost'):
WITH_BF_BOOST = False WITH_BF_BOOST = False
BF_BOOST = '/usr' BF_BOOST = '/usr'
BF_BOOST_INC = BF_BOOST + '/include' BF_BOOST_INC = BF_BOOST + '/include'
BF_BOOST_LIB = 'boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt' BF_BOOST_LIB = 'boost_date_time boost_filesystem boost_regex boost_system boost_thread'
BF_BOOST_LIBPATH = BF_BOOST + '/lib' BF_BOOST_LIBPATH = BF_BOOST + '/lib'
WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST