From dc90ce5b6da1ad3a52dd31edcf7a28428b8994c8 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Thu, 21 Feb 2013 17:14:07 +0000 Subject: Cycles GPU rendering: * Deprecate computing capability 1.3 (sm_13) This commit disables auto build of sm_13 CUDA platform, which means that starting with Blender 2.67, we don't support sm_13 devices anymore. It has become difficult to support that and it was already feature incomplete (no render-passes, AO, Multi Closure etc). It's still possible to manually enable sm_13 for own tests, but building might break in the future. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index d208d730e1d..d6a0fa4e016 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -250,7 +250,7 @@ option(WITH_CYCLES "Enable cycles Render Engine" ON) option(WITH_CYCLES_TEST "Build cycles test application" OFF) option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF) option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF) -set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for") +set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 CACHE STRING "CUDA architectures to build binaries for") mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) unset(PLATFORM_DEFAULT) -- cgit v1.2.3 From 3d9dc6a2e488cd47eafb716b65f479831c4bcd9f Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Fri, 22 Feb 2013 22:24:38 +0000 Subject: WITH_PYTHON_FRAMEWORK cmake option for OSX This option allow Blender to be linked against the Framework python It's useful if you want to have blenderplayer and bpy in the same application and need to avoid PyThread problems. patch reviewed by Jens Verwiebe before 2.66. He may want to change something though. (also small: I changed: /Library/Frameworks/Python.framework/Versions//python by /Library/Frameworks/Python.framework/Versions//Python as the latter seems to be the norm) --- CMakeLists.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index d6a0fa4e016..8b225af07e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,6 +124,10 @@ mark_as_advanced(WITH_PYTHON_SECURITY) # some distributions see this as a secur option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF) option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF) +if (APPLE) + option(WITH_PYTHON_FRAMEWORK "Enable building using the Python available in the framework (OSX only)" OFF) +endif() + option(WITH_BUILDINFO "Include extra build details (only disable for development & faster builds)" ON) option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON) option(WITH_IK_SOLVER "Enable Legacy IK solver (only disable for development)" ON) @@ -1457,11 +1461,10 @@ elseif(APPLE) endif() if(WITH_PYTHON) - if(NOT WITH_PYTHON_MODULE) - # we use precompiled libraries for py 3.3 and up by default - + # we use precompiled libraries for py 3.3 and up by default + set(PYTHON_VERSION 3.3) + if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK) # normally cached but not since we include them with blender - set(PYTHON_VERSION 3.3) set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m") # set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet set(PYTHON_LIBRARY python${PYTHON_VERSION}m) @@ -1469,9 +1472,6 @@ elseif(APPLE) # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled else() # module must be compiled against Python framework - - # normally cached but not since we include them with blender - set(PYTHON_VERSION 3.3) set(PYTHON_INCLUDE_DIR "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/include/python${PYTHON_VERSION}m") set(PYTHON_BINARY "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/bin/python${PYTHON_VERSION}") #set(PYTHON_LIBRARY python${PYTHON_VERSION}) @@ -1573,8 +1573,8 @@ elseif(APPLE) set(WITH_INPUT_NDOF OFF) # unsupported endif() - if(WITH_PYTHON_MODULE) - set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/python")# force cmake to link right framework + if(WITH_PYTHON_MODULE OR WITH_PYTHON_FRAMEWORK) + set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/Python")# force cmake to link right framework endif() if(WITH_OPENCOLLADA) @@ -2182,6 +2182,9 @@ if(FIRST_RUN) info_cfg_option(WITH_PYTHON_INSTALL_NUMPY) info_cfg_option(WITH_PYTHON_MODULE) info_cfg_option(WITH_PYTHON_SAFETY) + if(APPLE) + info_cfg_option(WITH_PYTHON_FRAMEWORK) + endif() info_cfg_text("Modifiers:") info_cfg_option(WITH_MOD_BOOLEAN) -- cgit v1.2.3 From 92189ab35331a238aee946b2cd2e542de26f0474 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sat, 23 Feb 2013 20:42:15 +0000 Subject: Rename CMake's Boost_USE_ICU to WITH_BOOST_ICU (update your CMake conf if you make static builds!), and add it as CMake option. Patch by gdh (Gavin Howard), many thanks! --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b225af07e5..b174fa2ac34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -243,6 +243,10 @@ option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the rayt if(UNIX AND NOT APPLE) option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON) option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF) + if(WITH_STATIC_LIBS) + option(WITH_BOOST_ICU "Boost uses ICU library (required for linking with static Boost built with libicu)." OFF) + mark_as_advanced(WITH_BOOST_ICU) + endif() endif() option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON) option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder" ON) @@ -683,7 +687,7 @@ if(UNIX AND NOT APPLE) list(APPEND __boost_packages locale) endif() find_package(Boost 1.48 COMPONENTS ${__boost_packages}) - if(Boost_USE_STATIC_LIBS AND Boost_USE_ICU) + if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU) find_package(IcuLinux) endif() mark_as_advanced(Boost_DIR) # why doesnt boost do this? -- cgit v1.2.3