Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 10 Jun 2018 06:21:38 +0000 (08:21 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 10 Jun 2018 06:21:50 +0000 (08:21 +0200)
30 files changed:
CMakeLists.txt
build_files/build_environment/cmake/numpy.cmake
build_files/build_environment/cmake/openal.cmake
build_files/build_environment/cmake/openjpeg.cmake
build_files/build_environment/cmake/options.cmake
build_files/build_environment/cmake/x264.cmake
build_files/cmake/Modules/FindAlembic.cmake
build_files/cmake/Modules/FindEigen3.cmake
build_files/cmake/Modules/FindFftw3.cmake
build_files/cmake/Modules/FindGLEW.cmake
build_files/cmake/Modules/FindIcuLinux.cmake
build_files/cmake/Modules/FindJack.cmake
build_files/cmake/Modules/FindJeMalloc.cmake
build_files/cmake/Modules/FindLZO.cmake
build_files/cmake/Modules/FindOpenCOLLADA.cmake
build_files/cmake/Modules/FindOpenColorIO.cmake
build_files/cmake/Modules/FindOpenEXR.cmake
build_files/cmake/Modules/FindOpenImageIO.cmake
build_files/cmake/Modules/FindOpenJPEG.cmake
build_files/cmake/Modules/FindPCRE.cmake
build_files/cmake/Modules/FindPugiXML.cmake
build_files/cmake/Modules/FindPythonLibsUnix.cmake
build_files/cmake/Modules/FindSndFile.cmake
build_files/cmake/Modules/FindSpacenav.cmake
build_files/cmake/Modules/FindXML2.cmake
build_files/cmake/RpmBuild.cmake
build_files/cmake/config/blender_headless.cmake
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_apple_xcode.cmake
build_files/cmake/platform/platform_win32.cmake

index 69d0abe1e2536270d42975e0a685849fef5fa241..5f1b9b1643cb59b4ad3eb1292a0c341a9151c8f3 100644 (file)
@@ -196,7 +196,7 @@ mark_as_advanced(WITH_BLENDER)
 option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
 
 option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
-option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default" ON) 
+option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default" ON)
 mark_as_advanced(WITH_PYTHON)  # dont want people disabling this unless they really know what they are doing.
 mark_as_advanced(WITH_PYTHON_SECURITY)  # some distributions see this as a security issue, rather than have them patch it, make a build option.
 
@@ -545,10 +545,11 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
                        find_library(COMPILER_ASAN_LIBRARY asan ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
                else()
                        find_library( COMPILER_ASAN_LIBRARY NAMES clang_rt.asan-x86_64
-                               PATHS   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/7.0.0/lib/windows
-                                               [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/6.0.0/lib/windows
-                                               )
-               endif() 
+                               PATHS
+                               [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/7.0.0/lib/windows
+                               [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/6.0.0/lib/windows
+                       )
+               endif()
                mark_as_advanced(COMPILER_ASAN_LIBRARY)
        endif()
 endif()
@@ -1206,7 +1207,7 @@ else()
 
                list(APPEND GL_DEFINITIONS -DGLEW_STATIC)
 
-               # This won't affect the non-experimental glew library, 
+               # This won't affect the non-experimental glew library,
                # but is used for conditional compilation elsewhere.
                list(APPEND GL_DEFINITIONS -DGLEW_NO_ES)
 
@@ -1496,7 +1497,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
                "/wd4267"  # conversion from 'size_t' to 'type', possible loss of data
                "/wd4305"  # truncation from 'type1' to 'type2'
                "/wd4800"  # forcing value to bool 'true' or 'false'
-               "/wd4828"  # The file contains a character that is illegal 
+               "/wd4828"  # The file contains a character that is illegal
                # errors:
                "/we4013"  # 'function' undefined; assuming extern returning int
                "/we4133"  # incompatible pointer types
index 3579042981f0d88ddcfbe8c1263d47d09cbb67a8..0d5d8abf7ab4b02d63aabc5d30e196d3fab7a304 100644 (file)
@@ -33,8 +33,8 @@ set(NUMPY_POSTFIX)
 if(WIN32)
        set(NUMPY_INSTALL
                ${CMAKE_COMMAND} -E copy_directory "${BUILD_DIR}/python/src/external_python/run/lib/site-packages/numpy/core/include/numpy" "${LIBDIR}/python/include/python${PYTHON_SHORT_VERSION}/numpy" &&
-               ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-${PYTHON_SHORT_VERSION}${NUMPY_DIR_POSTFIX}" 
-               ${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz" "." 
+               ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-${PYTHON_SHORT_VERSION}${NUMPY_DIR_POSTFIX}"
+               ${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz" "."
        )
        set(NUMPY_PATCH ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/numpy/src/external_numpy < ${PATCH_DIR}/numpy.diff )
 else()
index 2af530069a5b05555ef319f82947b8d889d050cb..0bc0452dd8cdc4c05e0a620688a01813b9cfa692 100644 (file)
@@ -39,6 +39,6 @@ if(BUILD_MODE STREQUAL Release)
                PREFIX ${BUILD_DIR}/openal
                CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
                INSTALL_DIR ${LIBDIR}/openal
-               PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff 
+               PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff
        )
 endif()
index 37f9e6de32b323e1ae89e5626dce93792207bf96..5cc49b1e519f522e28edac73cab2d7fe63844963 100644 (file)
@@ -46,7 +46,7 @@ if(MSVC)
                DOWNLOAD_DIR ${DOWNLOAD_DIR}
                URL_HASH SHA256=${OPENJPEG_HASH}
                PREFIX ${BUILD_DIR}/openjpeg_msvc
-               CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF 
+               CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF
                INSTALL_DIR ${LIBDIR}/openjpeg_msvc
        )
        if(BUILD_MODE STREQUAL Release)
index 2a89bd726c170acde25b4dd87ba59c0a4399a7f3..08d43d6a0a2c36afe0290f89fd8526bfde4ab4e3 100644 (file)
@@ -57,9 +57,9 @@ if(WIN32)
        set(COMMON_DEFINES /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
 
        if(MSVC_VERSION GREATER 1909)
-               set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings. 
+               set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings.
        endif()
-       
+
        if(WITH_OPTIMIZED_DEBUG)
                set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
        else()
index 64029ca1b5e27319121c07ecd0cec544f8435ef4..f42015e43952bd99e332c2c49f56c53ec3d75cec 100644 (file)
@@ -25,7 +25,7 @@ ExternalProject_Add(external_x264
        DOWNLOAD_DIR ${DOWNLOAD_DIR}
        URL_HASH SHA256=${X264_HASH}
        PREFIX ${BUILD_DIR}/x264
-       CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264 
+       CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
                --enable-static
                --enable-pic
                --disable-lavf
index 9f975c08e1a6ea836be93b2d9f3c8a3b23d2b0e0..59eb240804ffc407fd5d355423e560d5d6d62bf2 100644 (file)
@@ -51,7 +51,7 @@ FIND_LIBRARY(ALEMBIC_LIBRARY
     lib64 lib lib/static
 )
 
-# handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALEMBIC DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_INCLUDE_DIR)
index c1b25d4169ce8a6fb5983d7295b2e981a9be190a..2b23c2a6edca1845e7d1ea953fa48cd29275ff6d 100644 (file)
@@ -40,7 +40,7 @@ FIND_PATH(EIGEN3_INCLUDE_DIR
     include/eigen3
 )
 
-# handle the QUIETLY and REQUIRED arguments and set EIGEN3_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set EIGEN3_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eigen3 DEFAULT_MSG
index 8917cc1c120f08d06ce4d3365262eeeef7368732..767846af015cc40172b74875a5814bef254b4db1 100644 (file)
@@ -52,7 +52,7 @@ FIND_LIBRARY(FFTW3_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fftw3 DEFAULT_MSG
index 3057237f3c66c01de02966d3007e45c34ea3e061..b36a3272e3dbf25679f324dbb1d558aa820eb4a1 100644 (file)
@@ -49,7 +49,7 @@ FIND_LIBRARY(GLEW_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Glew DEFAULT_MSG
index 5ccd327da167ba3902fe018f40d33ff66125f2ac..c5164913f7f2fb6ebef0e3c37787b9fbd49b9510 100644 (file)
@@ -115,7 +115,7 @@ if(Boost_USE_STATIC_LIBS)
   set(CMAKE_FIND_LIBRARY_SUFFIXES ${_icu_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
 endif()
 
-# handle the QUIETLY and REQUIRED arguments and set ICU_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set ICU_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Icu DEFAULT_MSG
index ab4fdc99f25b9600ddacf2bf901453063b78d6f5..dbfc30edb996d77805302b35baa8407e0552bc8a 100644 (file)
@@ -52,7 +52,7 @@ FIND_LIBRARY(JACK_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jack DEFAULT_MSG
index 707739a3d989ebc8f3278bbd12eda2d96d3e420b..506892b34ba2b2e844a0bf58513546821ef3e0ed 100644 (file)
@@ -53,7 +53,7 @@ FIND_LIBRARY(JEMALLOC_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(JeMalloc DEFAULT_MSG
index 7aa4adca77705c3514c5b661a4db34f7c2ed46b5..6a70186150fbe51330c207d7291c4c8bb92de926 100644 (file)
@@ -50,7 +50,7 @@ FIND_LIBRARY(LZO_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set LZO_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set LZO_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZO DEFAULT_MSG
index ed9948b8a6cd86fa517825ca6a390eca7b46c864..45ef682cb61eed44612e14f24ab51110b2e48e8f 100644 (file)
@@ -1,7 +1,7 @@
 # - Find OpenCOLLADA library
 # Find the native OpenCOLLADA includes and library
 # This module defines
-#  OPENCOLLADA_INCLUDE_DIRS, where to find COLLADABaseUtils/ and 
+#  OPENCOLLADA_INCLUDE_DIRS, where to find COLLADABaseUtils/ and
 #                 COLLADAFramework/, Set when OPENCOLLADA_INCLUDE_DIR is found.
 #  OPENCOLLADA_LIBRARIES, libraries to link against to use OpenCOLLADA.
 #  OPENCOLLADA_ROOT_DIR, The base directory to search for OpenCOLLADA.
@@ -129,7 +129,7 @@ FOREACH(COMPONENT ${_opencollada_FIND_STATIC_COMPONENTS})
 ENDFOREACH()
 
 
-# handle the QUIETLY and REQUIRED arguments and set OPENCOLLADA_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set OPENCOLLADA_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenCOLLADA  DEFAULT_MSG
index bcc22f55bcce384ac532c47d3dfb222038817bea..1d26d6b0f8663cf10e33a6d1c4e2f09747e2a14b 100644 (file)
@@ -68,7 +68,7 @@ FOREACH(COMPONENT ${_opencolorio_FIND_COMPONENTS})
 ENDFOREACH()
 
 
-# handle the QUIETLY and REQUIRED arguments and set OPENCOLORIO_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set OPENCOLORIO_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenColorIO DEFAULT_MSG
index ef8d76ea3a557ef2c5a47679014d135f3c64993d..fa02d3f3f28b6b36ad34ce1b1e372f4833d8d5ad 100644 (file)
@@ -106,7 +106,7 @@ FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
 
   FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY
     NAMES
-      ${COMPONENT}-${_openexr_libs_ver} ${COMPONENT} 
+      ${COMPONENT}-${_openexr_libs_ver} ${COMPONENT}
     HINTS
       ${_openexr_SEARCH_DIRS}
     PATH_SUFFIXES
@@ -117,7 +117,7 @@ ENDFOREACH()
 
 UNSET(_openexr_libs_ver)
 
-# handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR  DEFAULT_MSG
index 52b7856c79cebadf6ec10990f171fb2939bdba41..5652e1649c8df3cae13f2e7871a7e5c11e05711e 100644 (file)
@@ -64,7 +64,7 @@ FIND_FILE(OPENIMAGEIO_IDIFF
     bin
 )
 
-# handle the QUIETLY and REQUIRED arguments and set OPENIMAGEIO_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set OPENIMAGEIO_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO DEFAULT_MSG
index 4b021f136340ca54374fcdc8ab41785d9e4a5a6d..85a4c131fb1de2e380eeeb8e5ce20c013af6c571 100644 (file)
@@ -53,7 +53,7 @@ FIND_LIBRARY(OPENJPEG_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set OPENJPEG_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set OPENJPEG_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenJPEG DEFAULT_MSG
index 1649a6cbb367353235164a206c1c91b13183fd99..20b5c1d5c28aef0a5809bafab1e11c466326ce30 100644 (file)
@@ -50,7 +50,7 @@ FIND_LIBRARY(PCRE_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG
index 2a0dcf08c7e67b4cd82c287dcf6cd87b52e489eb..629069c90326509bc8550f286d14dbb7f7d6e75e 100644 (file)
@@ -53,7 +53,7 @@ FIND_LIBRARY(PUGIXML_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set PUGIXML_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set PUGIXML_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PUGIXML DEFAULT_MSG
index 493fb0df6a7d56e3bf5d45253e9f4cd4894f0d57..140f8be048a21e24317adfe0053d8a71a8ce9cae 100644 (file)
@@ -175,7 +175,7 @@ UNSET(_IS_INC_CONF_DEF)
 UNSET(_IS_LIB_DEF)
 UNSET(_IS_LIB_PATH_DEF)
 
-# handle the QUIETLY and REQUIRED arguments and SET PYTHONLIBSUNIX_FOUND to TRUE IF 
+# handle the QUIETLY and REQUIRED arguments and SET PYTHONLIBSUNIX_FOUND to TRUE IF
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibsUnix  DEFAULT_MSG
index c210c523c581900b4ef37a3b74bacf79252d2dcd..ef6fb73598f7ca406208b5aa36e0cee0b8ead154 100644 (file)
@@ -50,7 +50,7 @@ FIND_LIBRARY(LIBSNDFILE_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set LIBSNDFILE_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set LIBSNDFILE_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG
index 84599643c2db5f43d99b916bd3fe0fc168ab1910..593ed54a08e33e033b777c80505cacfe1e04421c 100644 (file)
@@ -52,7 +52,7 @@ FIND_LIBRARY(SPACENAV_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set SPACENAV_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set SPACENAV_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Spacenav DEFAULT_MSG
index d2df90fa2ec4a2700314252f47affab6b0a96c3c..e69a14c930667bbc7b5c9c36dbec7afccb811ebe 100644 (file)
@@ -50,7 +50,7 @@ FIND_LIBRARY(XML2_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set XML2_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set XML2_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(XML2 DEFAULT_MSG
index f46c41e4d0e0fede5cde11751e2ab68d470c8ecb..36c8768dd0e88f372f6eb681b23ee86ceae866a3 100644 (file)
@@ -13,7 +13,7 @@ if(NOT DEFINED RPMBUILD)
 
        if(RPMBUILD)
                message(STATUS "RPM Build Found: ${RPMBUILD}")
-       else() 
+       else()
                message(STATUS "RPM Build Not Found (rpmbuild). RPM generation will not be available")
        endif()
 
@@ -21,6 +21,6 @@ endif()
 
 if(RPMBUILD)
        set(RPMBUILD_FOUND TRUE)
-else() 
+else()
        set(RPMBUILD_FOUND FALSE)
-endif()
\ No newline at end of file
+endif()
index 8f2ad03279c2b4c3fe32407bca02ac587ea2ddab..73b4327264351ca36a415bb19a154024b452f884 100644 (file)
@@ -5,7 +5,7 @@
 #   cmake -C../blender/build_files/cmake/config/blender_headless.cmake  ../blender
 #
 
-set(WITH_HEADLESS            ON  CACHE BOOL "" FORCE) 
+set(WITH_HEADLESS            ON  CACHE BOOL "" FORCE)
 
 # disable audio, its possible some devs may want this but for now disable
 # so the python module doesnt hold the audio device and loads quickly.
index 6157730af8edba9c0e2fa9ecf5cf446d8ac26b7c..8cf90d0d22c662ae4686e16b94eae1e6e7edce57 100644 (file)
@@ -51,7 +51,7 @@ endmacro()
 function(list_assert_duplicates
        list_id
        )
-       
+
        # message(STATUS "list data: ${list_id}")
 
        list(LENGTH list_id _len_before)
@@ -242,7 +242,7 @@ function(blender_add_lib__impl
        # listed is helpful for IDE's (QtCreator/MSVC)
        blender_source_group("${sources}")
 
-       #if enabled, set the FOLDER property for visual studio projects 
+       #if enabled, set the FOLDER property for visual studio projects
        if(WINDOWS_USE_VISUAL_STUDIO_FOLDERS)
                get_filename_component(FolderDir ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
                string(REPLACE ${CMAKE_SOURCE_DIR} "" FolderDir ${FolderDir})
index 8bb08b5a29fbe2cda363a7bb939b8127192e2f33..1b8e13a062314f68e4be401380f6636a7460ce4a 100644 (file)
@@ -51,9 +51,9 @@ string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate
 if(${CMAKE_GENERATOR} MATCHES "Xcode")
 
        # earlier xcode has no bundled developer dir, no sense in getting xcode path from
-       if(${XCODE_VERSION} VERSION_GREATER 4.2) 
+       if(${XCODE_VERSION} VERSION_GREATER 4.2)
                # reduce to XCode name without dp extension
-               string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) 
+               string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME)
                if(${DP_NAME} MATCHES Xcode5)
                        set(XCODE_VERSION 5)
                endif()
@@ -64,7 +64,7 @@ if(${CMAKE_GENERATOR} MATCHES "Xcode")
                message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")
        endif()
        ### end cmake incompatibility with xcode 4.3 and higher ###
-       
+
        if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4 AND ${XCODE_VERSION} VERSION_LESS 4.3)
                # Xcode 4 defaults to the Apple LLVM Compiler.
                # Override the default compiler selection because Blender only compiles with gcc up to xcode 4.2
@@ -85,7 +85,7 @@ if(${XCODE_VERSION} VERSION_LESS 4.3)
 else()
        # 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  
+       # 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
index 0ee0845be33a6264952b0eb274962caa3d8024a5..468e82e8dacd39c6f012e63b7abc62548aeb0915 100644 (file)
@@ -130,8 +130,8 @@ include(InstallRequiredSystemLibraries)
 
 remove_cc_flag("/MDd" "/MD")
 
-if(MSVC_CLANG) # Clangs version of cl doesn't support all flags 
-       if(NOT WITH_CXX11) # C++11 is on by default in clang-cl and can't be turned off, if c++11 is not enabled in blender repress some c++11 related warnings. 
+if(MSVC_CLANG) # Clangs version of cl doesn't support all flags
+       if(NOT WITH_CXX11) # C++11 is on by default in clang-cl and can't be turned off, if c++11 is not enabled in blender repress some c++11 related warnings.
                set(CXX_WARN_FLAGS "-Wno-inconsistent-missing-override")
        endif()
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARN_FLAGS} /nologo /J /Gd /EHsc -Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference ")
@@ -425,7 +425,7 @@ if(WITH_OPENIMAGEIO)
        set(OIIO_OPTIMIZED optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO.lib optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util.lib)
        set(OIIO_DEBUG debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_d.lib debug ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util_d.lib)
        set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG})
-       
+
        set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
        set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
        set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
@@ -474,7 +474,7 @@ if(WITH_OPENVDB)
        set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
        set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include ${TBB_INCLUDE_DIR})
        set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
-       
+
 endif()
 
 if(WITH_ALEMBIC)