Commit: ae01df5779de8ba76f46e51449891e567701d2d8
Author: Campbell Barton
Date: Sun Jun 10 08:12:13 2018 +0200
Branches: master
https://developer.blender.org/rBae01df5779de8ba76f46e51449891e567701d2d8
Cleanup: trailing space in CMake files
===================================================================
M CMakeLists.txt
M build_files/build_environment/cmake/numpy.cmake
M build_files/build_environment/cmake/openal.cmake
M build_files/build_environment/cmake/openjpeg.cmake
M build_files/build_environment/cmake/options.cmake
M build_files/build_environment/cmake/x264.cmake
M build_files/cmake/Modules/FindAlembic.cmake
M build_files/cmake/Modules/FindEigen3.cmake
M build_files/cmake/Modules/FindFftw3.cmake
M build_files/cmake/Modules/FindGLEW.cmake
M build_files/cmake/Modules/FindIcuLinux.cmake
M build_files/cmake/Modules/FindJack.cmake
M build_files/cmake/Modules/FindJeMalloc.cmake
M build_files/cmake/Modules/FindLZO.cmake
M build_files/cmake/Modules/FindOpenCOLLADA.cmake
M build_files/cmake/Modules/FindOpenColorIO.cmake
M build_files/cmake/Modules/FindOpenEXR.cmake
M build_files/cmake/Modules/FindOpenImageIO.cmake
M build_files/cmake/Modules/FindOpenJPEG.cmake
M build_files/cmake/Modules/FindPCRE.cmake
M build_files/cmake/Modules/FindPugiXML.cmake
M build_files/cmake/Modules/FindPythonLibsUnix.cmake
M build_files/cmake/Modules/FindSndFile.cmake
M build_files/cmake/Modules/FindSpacenav.cmake
M build_files/cmake/Modules/FindXML2.cmake
M build_files/cmake/RpmBuild.cmake
M build_files/cmake/config/blender_headless.cmake
M build_files/cmake/macros.cmake
M build_files/cmake/platform/platform_apple_xcode.cmake
M build_files/cmake/platform/platform_win32.cmake
===================================================================
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/
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
