Commit: cd38c31fe9c9e984c645e2740b1a00f75db61d6d
Author: Campbell Barton
Date: Wed May 18 11:58:08 2016 +1000
Branches: compositor-2016
https://developer.blender.org/rBcd38c31fe9c9e984c645e2740b1a00f75db61d6d
Cleanup: cmake, indentation, line length
===================================================================
M CMakeLists.txt
M source/creator/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32c67ba..44a9b68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -519,8 +519,8 @@ if(APPLE)
if(NOT CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
- "Choose the architecture you want to build Blender for: i386,
x86_64 or ppc"
- FORCE)
+ "Choose the architecture you want to build Blender for:
i386, x86_64 or ppc"
+ FORCE)
endif()
if(NOT DEFINED OSX_SYSTEM)
@@ -530,15 +530,20 @@ if(APPLE)
OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
- # workaround for incorrect cmake xcode lookup for developer previews -
XCODE_VERSION does not take xcode-select path into accout
- # but would always look into /Applications/Xcode.app while dev versions
are named Xcode<version>-DP<preview_number>
- execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE
XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)
+ # workaround for incorrect cmake xcode lookup for developer previews -
XCODE_VERSION does not
+ # take xcode-select path into account but would always look into
/Applications/Xcode.app
+ # while dev versions are named Xcode<version>-DP<preview_number>
+ execute_process(
+ COMMAND xcode-select --print-path
+ OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) #
truncate to bundlepath in any case
if(${CMAKE_GENERATOR} MATCHES "Xcode")
- if(${XCODE_VERSION} VERSION_GREATER 4.2) # earlier xcode has no
bundled developer dir, no sense in getting xcode path from
- string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) #
reduce to XCode name without dp extension
+ # earlier xcode has no bundled developer dir, no sense in
getting xcode path from
+ if(${XCODE_VERSION} VERSION_GREATER 4.2)
+ # reduce to XCode name without dp extension
+ string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME)
if(${DP_NAME} MATCHES Xcode5)
set(XCODE_VERSION 5)
endif()
@@ -565,25 +570,30 @@ if(APPLE)
message(STATUS "Detected OS X ${OSX_SYSTEM} and Xcode ${XCODE_VERSION}
at ${XCODE_BUNDLE}")
if(${XCODE_VERSION} VERSION_LESS 4.3)
- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk
CACHE PATH "" FORCE) # use guaranteed existing sdk
+ # use guaranteed existing sdk
+ set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk
CACHE PATH "" FORCE)
else()
- # note: xcode-select path could be ambigous, cause
/Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be
allowed
+ # note: xcode-select path could be ambigous,
+ # cause /Applications/Xcode.app/Contents/Developer or
/Applications/Xcode.app would be allowed
# so i use a selfcomposed bundlepath here
set(OSX_SYSROOT_PREFIX
${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform)
message(STATUS "OSX_SYSROOT_PREFIX: " ${OSX_SYSROOT_PREFIX})
set(OSX_DEVELOPER_PREFIX
/Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
set(CMAKE_OSX_SYSROOT
${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
if(${CMAKE_GENERATOR} MATCHES "Xcode")
- set(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx${OSX_SYSTEM})
# to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT
+ # to silence sdk not found warning, just overrides
CMAKE_OSX_SYSROOT
+ set(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx${OSX_SYSTEM})
endif()
endif()
if(OSX_SYSTEM MATCHES 10.9)
- set(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT}) # make sure
syslibs and headers are looked up in sdk ( expecially for 10.9 openGL atm. )
+ # make sure syslibs and headers are looked up in sdk (
expecially for 10.9 openGL atm. )
+ set(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT})
endif()
if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6" CACHE STRING "" FORCE) #
10.6 is our min. target, if you use higher sdk, weak linking happens
+ # 10.6 is our min. target, if you use higher sdk, weak linking
happens
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6" CACHE STRING "" FORCE)
endif()
if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
@@ -599,7 +609,10 @@ endif()
# Check for conflicting/unsupported configurations
if(NOT WITH_BLENDER AND NOT WITH_PLAYER AND NOT WITH_CYCLES_STANDALONE)
- message(FATAL_ERROR "At least one of WITH_BLENDER or WITH_PLAYER or
WITH_CYCLES_STANDALONE must be enabled, nothing to do!")
+ message(FATAL_ERROR
+ "At least one of WITH_BLENDER or WITH_PLAYER or "
+ "WITH_CYCLES_STANDALONE must be enabled, nothing to do!"
+ )
endif()
if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -663,7 +676,8 @@ if(NOT WITH_BOOST)
set_and_warn(WITH_OPENAL OFF) # depends on AUDASPACE
set_and_warn(WITH_GAMEENGINE OFF) # depends on AUDASPACE
set_and_warn(WITH_PLAYER OFF) # depends on GAMEENGINE
-elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_AUDASPACE OR WITH_INTERNATIONAL
OR WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_MOD_BOOLEAN)
+elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_AUDASPACE OR WITH_INTERNATIONAL
OR
+ WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_MOD_BOOLEAN)
# Keep enabled
else()
# New dependency graph needs either Boost or C++11 for function
bindings.
@@ -760,18 +774,22 @@ endif()
if(WITH_INTERNATIONAL)
if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/datafiles/locale/languages")
- message(WARNING "Translation path
'${CMAKE_SOURCE_DIR}/release/datafiles/locale' is missing, "
- "This is a 'git submodule',
which are known not to work with bridges to other version "
- "control systems, disabling
'WITH_INTERNATIONAL'.")
+ message(WARNING
+ "Translation path
'${CMAKE_SOURCE_DIR}/release/datafiles/locale' is missing, "
+ "This is a 'git submodule', which are known not to work
with bridges to other version "
+ "control systems, disabling 'WITH_INTERNATIONAL'."
+ )
set(WITH_INTERNATIONAL OFF)
endif()
endif()
if(WITH_PYTHON)
if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/scripts/addons/modules")
- message(WARNING "Addons path
'${CMAKE_SOURCE_DIR}/release/scripts/addons' is missing, "
- "This is a 'git submodule',
which are known not to work with bridges to other version "
- "control systems: * CONTINUING
WITHOUT ADDONS *")
+ message(WARNING
+ "Addons path
'${CMAKE_SOURCE_DIR}/release/scripts/addons' is missing, "
+ "This is a 'git submodule', which are known not to work
with bridges to other version "
+ "control systems: * CONTINUING WITHOUT ADDONS *"
+ )
endif()
endif()
@@ -1042,7 +1060,11 @@ if(UNIX AND NOT APPLE)
if(${OSL_LIBRARY_VERSION_MAJOR} EQUAL "1" AND
${OSL_LIBRARY_VERSION_MINOR} LESS "6")
# Note: --whole-archive is needed to force
loading of all symbols in liboslexec,
# otherwise LLVM is missing the
osl_allocate_closure_component function
- set(OSL_LIBRARIES ${OSL_OSLCOMP_LIBRARY}
-Wl,--whole-archive ${OSL_OSLEXEC_LIBRARY} -Wl,--no-whole-archive
${OSL_OSLQUERY_LIBRARY})
+ set(OSL_LIBRARIES
+ ${OSL_OSLCOMP_LIBRARY}
+ -Wl,--whole-archive
${OSL_OSLEXEC_LIBRARY}
+ -Wl,--no-whole-archive
${OSL_OSLQUERY_LIBRARY}
+ )
endif()
else()
message(STATUS "OSL not found, disabling it from
Cycles")
@@ -1113,7 +1135,13 @@ if(UNIX AND NOT APPLE)
set(PUGIXML_LIBRARIES "")
endif()
- set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES}
${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
+ set(OPENIMAGEIO_LIBRARIES
+ ${OPENIMAGEIO_LIBRARIES}
+ ${PNG_LIBRARIES}
+ ${JPEG_LIBRARIES}
+ ${ZLIB_LIBRARIES}
+ ${BOOST_LIBRARIES}
+ )
set(OPENIMAGEIO_LIBPATH) # TODO, remove and reference the
absolute path everywhere
set(OPENIMAGEIO_DEFINITIONS "")
@@ -1154,7 +1182,9 @@ if(UNIX AND NOT APPLE)
if(WITH_LLVM OR WITH_SDL_DYNLOAD)
# Fix for conflict with Mesa llvmpipe
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS}
-Wl,--version-script='${CMAKE_SOURCE_DIR}/source/creator/blender.map'")
+ set(PLATFORM_LINKFLAGS
+ "${PLATFORM_LINKFLAGS}
-Wl,--version-script='${CMAKE_SOURCE_DIR}/source/creator/blender.map'"
+ )
endif()
if(WITH_OPENSUBDIV)
@@ -1257,7 +1287,10 @@ elseif(WIN32)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}
/SAFESEH:NO")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}
/SAFESEH:NO")
- list(APPEND PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32
user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid psapi
Dbghelp)
+ list(APPEND PLATFORM_LINKLIBS
+ ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32
+ advapi32 shfolder shell32 ole32 oleaut32 uuid psapi
Dbghelp
+ )
if(WITH_INPUT_IME)
list(APPEND PLATFORM_LINKLIBS imm32)
@@ -1295,7 +1328,15 @@ elseif(WIN32)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
set(CMAKE_C_FLAGS_RELWITHDEBINFO
"${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT")
- set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152
/INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib
/NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib")
+ set(PLATFORM_LINKFLAGS
+ "/SUBSYSTEM:CONSOLE "
+ "/STACK:2097152 "
+ "/INCREMENTAL:NO "
+ "/NODEFAULTLIB:msvcrt.lib "
+ "/NODEFAULTLIB:msvcmrt.lib "
+ "/NODEFAULTLIB:msvcurt.lib "
+ "/NODEFAULTLIB:msvcrtd.lib "
+ )
# Ignore meaningless for us linker warnings.
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /ignore:4049
/ignore:4217 /ignore:4221")
@@ -1349,9 +1390,9 @@ elseif(WIN32)
# Add each of our libraries to our cmake_prefix_path so
find_package() could work
file(GLOB children RELATIVE ${LIBDIR} ${LIBDIR}/*)
foreach(child ${children})
- if(IS_DIRECTORY ${LIBDIR}/${child})
- list(APPEND CMAKE_PREFIX_PATH ${LIBDIR}/${child})
- endif()
+ if(IS_DIRECTORY ${LIBDIR}/${child})
+ list(APPEND CMAKE_PREFIX_PATH
${LIBDIR}/${child})
+ endif()
endforeach()
set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
@@ -1456,23 +1497,28 @@ elseif(WIN32)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}
${OPENEXR}/include/OpenEXR)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
set(OPENEXR_LIBRARIES
- optimized
${OPENEXR_LIBPATH}/Iex-2_2.lib debug ${OPENEXR_LIBPATH}/Iex-2_2_d.lib
- optimized ${OPENEXR_LIBPATH}/Half.lib
debug ${OPENEXR_LIBPATH}/Half_d.lib
- optimized
${OPENEXR_LIBPATH}/IlmImf-2_2.lib debug
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
