diff options
30 files changed, 52 insertions, 51 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e306e47f4e..3cfeaaa1be1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,7 +197,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. @@ -561,10 +561,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() @@ -1273,7 +1274,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) @@ -1565,7 +1566,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 diff --git a/build_files/build_environment/cmake/numpy.cmake b/build_files/build_environment/cmake/numpy.cmake index 3579042981f..0d5d8abf7ab 100644 --- a/build_files/build_environment/cmake/numpy.cmake +++ b/build_files/build_environment/cmake/numpy.cmake @@ -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() diff --git a/build_files/build_environment/cmake/openal.cmake b/build_files/build_environment/cmake/openal.cmake index 2af530069a5..0bc0452dd8c 100644 --- a/build_files/build_environment/cmake/openal.cmake +++ b/build_files/build_environment/cmake/openal.cmake @@ -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() diff --git a/build_files/build_environment/cmake/openjpeg.cmake b/build_files/build_environment/cmake/openjpeg.cmake index 37f9e6de32b..5cc49b1e519 100644 --- a/build_files/build_environment/cmake/openjpeg.cmake +++ b/build_files/build_environment/cmake/openjpeg.cmake @@ -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) diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index 2a89bd726c1..08d43d6a0a2 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -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() diff --git a/build_files/build_environment/cmake/x264.cmake b/build_files/build_environment/cmake/x264.cmake index 64029ca1b5e..f42015e4395 100644 --- a/build_files/build_environment/cmake/x264.cmake +++ b/build_files/build_environment/cmake/x264.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindAlembic.cmake b/build_files/cmake/Modules/FindAlembic.cmake index 9f975c08e1a..59eb240804f 100644 --- a/build_files/cmake/Modules/FindAlembic.cmake +++ b/build_files/cmake/Modules/FindAlembic.cmake @@ -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) diff --git a/build_files/cmake/Modules/FindEigen3.cmake b/build_files/cmake/Modules/FindEigen3.cmake index c1b25d4169c..2b23c2a6edc 100644 --- a/build_files/cmake/Modules/FindEigen3.cmake +++ b/build_files/cmake/Modules/FindEigen3.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindFftw3.cmake b/build_files/cmake/Modules/FindFftw3.cmake index 8917cc1c120..767846af015 100644 --- a/build_files/cmake/Modules/FindFftw3.cmake +++ b/build_files/cmake/Modules/FindFftw3.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindGLEW.cmake b/build_files/cmake/Modules/FindGLEW.cmake index 2f098d5d9a4..0504e75787b 100644 --- a/build_files/cmake/Modules/FindGLEW.cmake +++ b/build_files/cmake/Modules/FindGLEW.cmake @@ -60,7 +60,7 @@ FIND_LIBRARY(GLEW_MX_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 diff --git a/build_files/cmake/Modules/FindIcuLinux.cmake b/build_files/cmake/Modules/FindIcuLinux.cmake index 5ccd327da16..c5164913f7f 100644 --- a/build_files/cmake/Modules/FindIcuLinux.cmake +++ b/build_files/cmake/Modules/FindIcuLinux.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindJack.cmake b/build_files/cmake/Modules/FindJack.cmake index ab4fdc99f25..dbfc30edb99 100644 --- a/build_files/cmake/Modules/FindJack.cmake +++ b/build_files/cmake/Modules/FindJack.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindJeMalloc.cmake b/build_files/cmake/Modules/FindJeMalloc.cmake index 707739a3d98..506892b34ba 100644 --- a/build_files/cmake/Modules/FindJeMalloc.cmake +++ b/build_files/cmake/Modules/FindJeMalloc.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindLZO.cmake b/build_files/cmake/Modules/FindLZO.cmake index 7aa4adca777..6a70186150f 100644 --- a/build_files/cmake/Modules/FindLZO.cmake +++ b/build_files/cmake/Modules/FindLZO.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindOpenCOLLADA.cmake b/build_files/cmake/Modules/FindOpenCOLLADA.cmake index ed9948b8a6c..45ef682cb61 100644 --- a/build_files/cmake/Modules/FindOpenCOLLADA.cmake +++ b/build_files/cmake/Modules/FindOpenCOLLADA.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake index bcc22f55bcc..1d26d6b0f86 100644 --- a/build_files/cmake/Modules/FindOpenColorIO.cmake +++ b/build_files/cmake/Modules/FindOpenColorIO.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake index ef8d76ea3a5..fa02d3f3f28 100644 --- a/build_files/cmake/Modules/FindOpenEXR.cmake +++ b/build_files/cmake/Modules/FindOpenEXR.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake index 52b7856c79c..5652e1649c8 100644 --- a/build_files/cmake/Modules/FindOpenImageIO.cmake +++ b/build_files/cmake/Modules/FindOpenImageIO.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake index 4b021f13634..85a4c131fb1 100644 --- a/build_files/cmake/Modules/FindOpenJPEG.cmake +++ b/build_files/cmake/Modules/FindOpenJPEG.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindPCRE.cmake b/build_files/cmake/Modules/FindPCRE.cmake index 1649a6cbb36..20b5c1d5c28 100644 --- a/build_files/cmake/Modules/FindPCRE.cmake +++ b/build_files/cmake/Modules/FindPCRE.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindPugiXML.cmake b/build_files/cmake/Modules/FindPugiXML.cmake index 2a0dcf08c7e..629069c9032 100644 --- a/build_files/cmake/Modules/FindPugiXML.cmake +++ b/build_files/cmake/Modules/FindPugiXML.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindPythonLibsUnix.cmake b/build_files/cmake/Modules/FindPythonLibsUnix.cmake index 493fb0df6a7..140f8be048a 100644 --- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake +++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindSndFile.cmake b/build_files/cmake/Modules/FindSndFile.cmake index 4094b05adab..3b4ab38e842 100644 --- a/build_files/cmake/Modules/FindSndFile.cmake +++ b/build_files/cmake/Modules/FindSndFile.cmake @@ -50,7 +50,7 @@ FIND_LIBRARY(SNDFILE_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG diff --git a/build_files/cmake/Modules/FindSpacenav.cmake b/build_files/cmake/Modules/FindSpacenav.cmake index 84599643c2d..593ed54a08e 100644 --- a/build_files/cmake/Modules/FindSpacenav.cmake +++ b/build_files/cmake/Modules/FindSpacenav.cmake @@ -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 diff --git a/build_files/cmake/Modules/FindXML2.cmake b/build_files/cmake/Modules/FindXML2.cmake index d2df90fa2ec..e69a14c9306 100644 --- a/build_files/cmake/Modules/FindXML2.cmake +++ b/build_files/cmake/Modules/FindXML2.cmake @@ -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 diff --git a/build_files/cmake/RpmBuild.cmake b/build_files/cmake/RpmBuild.cmake index f46c41e4d0e..36c8768dd0e 100644 --- a/build_files/cmake/RpmBuild.cmake +++ b/build_files/cmake/RpmBuild.cmake @@ -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() diff --git a/build_files/cmake/config/blender_headless.cmake b/build_files/cmake/config/blender_headless.cmake index cfde86aac6d..4399eb9e5c4 100644 --- a/build_files/cmake/config/blender_headless.cmake +++ b/build_files/cmake/config/blender_headless.cmake @@ -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) set(WITH_GAMEENGINE OFF CACHE BOOL "" FORCE) # disable audio, its possible some devs may want this but for now disable diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 11fc3e110c1..38e738522c6 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -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}) diff --git a/build_files/cmake/platform/platform_apple_xcode.cmake b/build_files/cmake/platform/platform_apple_xcode.cmake index 8bb08b5a29f..1b8e13a0623 100644 --- a/build_files/cmake/platform/platform_apple_xcode.cmake +++ b/build_files/cmake/platform/platform_apple_xcode.cmake @@ -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 diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index ec70f11ea22..df96333e9f1 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -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) @@ -558,7 +558,7 @@ if(WITH_OPENAL) else() set(OPENAL_LIBRARY ${OPENAL_LIBPATH}/wrap_oal.lib) endif() - + endif() if(WITH_CODEC_SNDFILE) @@ -566,7 +566,7 @@ if(WITH_CODEC_SNDFILE) set(SNDFILE_INCLUDE_DIRS ${SNDFILE}/include) set(SNDFILE_LIBPATH ${SNDFILE}/lib) # TODO, deprecate set(SNDFILE_LIBRARIES ${SNDFILE_LIBPATH}/libsndfile-1.lib) - + endif() if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) |