Cleanup: trailing space cmake, make.bat
authorCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jun 2018 18:18:09 +0000 (20:18 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jun 2018 18:18:09 +0000 (20:18 +0200)
build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
build_files/build_environment/patches/cmake/modules/SelectLibraryConfigurations.cmake
make.bat

index de4c0ab..10075d7 100644 (file)
@@ -75,7 +75,7 @@ macro(PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
   # Handle new library names for OpenEXR 2.1 build via cmake
   string(REPLACE "." "_" _ILMBASE_VERSION ${ILMBASE_VERSION})
   string(SUBSTRING ${_ILMBASE_VERSION} 0 3 _ILMBASE_VERSION )
-  
+
   find_library(${tmp_prefix}_LIBRARY_RELEASE
     NAMES ${libname} ${libname}-${_ILMBASE_VERSION}
     HINTS ${${libpath_var}}
@@ -177,7 +177,7 @@ if(ILMBASE_INCLUDE_DIR)
              "\\1" XYZ ${ILMBASE_BUILD_SPECIFICATION})
       set("ILMBASE_VERSION" ${XYZ} CACHE STRING "Version of ILMBase lib")
     else()
-      # Old versions (before 2.0?) do not have any version string, just assuming 2.0 should be fine though. 
+      # Old versions (before 2.0?) do not have any version string, just assuming 2.0 should be fine though.
       message(WARNING "Could not determine ILMBase library version, assuming 2.0.")
       set("ILMBASE_VERSION" "2.0" CACHE STRING "Version of ILMBase lib")
     endif()
index 1eb4ea3..96a2ca9 100644 (file)
@@ -175,7 +175,7 @@ if(OPENEXR_INCLUDE_DIR)
              "\\1" XYZ ${OPENEXR_BUILD_SPECIFICATION})
       set("OPENEXR_VERSION" ${XYZ} CACHE STRING "Version of OpenEXR lib")
     else()
-      # Old versions (before 2.0?) do not have any version string, just assuming 2.0 should be fine though. 
+      # Old versions (before 2.0?) do not have any version string, just assuming 2.0 should be fine though.
       message(WARNING "Could not determine ILMBase library version, assuming 2.0.")
       set("OPENEXR_VERSION" "2.0" CACHE STRING "Version of OpenEXR lib")
     endif()
index 47234ce..796be8d 100644 (file)
@@ -6,7 +6,7 @@
 # basename_LIBRARY_RELEASE is defined, basename_LIBRARY, basename_LIBRARY_DEBUG,
 # and basename_LIBRARY_RELEASE will be set to the release value.  If only
 # basename_LIBRARY_DEBUG is defined, then basename_LIBRARY,
-# basename_LIBRARY_DEBUG and basename_LIBRARY_RELEASE will take the debug value.  
+# basename_LIBRARY_DEBUG and basename_LIBRARY_RELEASE will take the debug value.
 #
 # If the generator supports configuration types, then basename_LIBRARY and
 # basename_LIBRARIES will be set with debug and optimized flags specifying the
@@ -53,10 +53,10 @@ macro( select_library_configurations basename )
         # if the generator supports configuration types or CMAKE_BUILD_TYPE
         # is set, then set optimized and debug options.
         if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
-            set( ${basename}_LIBRARY 
+            set( ${basename}_LIBRARY
                 optimized ${${basename}_LIBRARY_RELEASE}
                 debug ${${basename}_LIBRARY_DEBUG} )
-            set( ${basename}_LIBRARIES 
+            set( ${basename}_LIBRARIES
                 optimized ${${basename}_LIBRARY_RELEASE}
                 debug ${${basename}_LIBRARY_DEBUG} )
         else( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
@@ -67,14 +67,14 @@ macro( select_library_configurations basename )
         endif( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
     endif( ${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE )
 
-    set( ${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH 
+    set( ${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH
         "The ${basename} library" )
 
     if( ${basename}_LIBRARY )
         set( ${basename}_FOUND TRUE )
     endif( ${basename}_LIBRARY )
 
-    mark_as_advanced( ${basename}_LIBRARY 
+    mark_as_advanced( ${basename}_LIBRARY
         ${basename}_LIBRARY_RELEASE
         ${basename}_LIBRARY_DEBUG
     )
index 18e861f..5fb428f 100644 (file)
--- a/make.bat
+++ b/make.bat
@@ -31,7 +31,7 @@ if "%BUILD_UPDATE%" == "1" (
        goto EOF
 )
 
-call "%BLENDER_DIR%\build_files\windows\detect_architecture.cmd" 
+call "%BLENDER_DIR%\build_files\windows\detect_architecture.cmd"
 
 if "%BUILD_VS_YEAR%" == "" (
        call "%BLENDER_DIR%\build_files\windows\autodetect_msvc.cmd"
@@ -47,28 +47,28 @@ if "%BUILD_VS_YEAR%" == "" (
        )
 )
 
-call "%BLENDER_DIR%\build_files\windows\set_build_dir.cmd" 
+call "%BLENDER_DIR%\build_files\windows\set_build_dir.cmd"
 
 echo Building blender with VS%BUILD_VS_YEAR% for %BUILD_ARCH% in %BUILD_DIR%
 
-call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd" 
+call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd"
 if errorlevel 1 goto EOF
 
-call "%BLENDER_DIR%\build_files\windows\check_submodules.cmd" 
+call "%BLENDER_DIR%\build_files\windows\check_submodules.cmd"
 if errorlevel 1 goto EOF
 
 if "%BUILD_WITH_NINJA%" == "" (
-       call "%BLENDER_DIR%\build_files\windows\configure_msbuild.cmd" 
+       call "%BLENDER_DIR%\build_files\windows\configure_msbuild.cmd"
        if errorlevel 1 goto EOF
 
-       call "%BLENDER_DIR%\build_files\windows\build_msbuild.cmd" 
+       call "%BLENDER_DIR%\build_files\windows\build_msbuild.cmd"
        if errorlevel 1 goto EOF
 ) else (
-       call "%BLENDER_DIR%\build_files\windows\configure_ninja.cmd" 
+       call "%BLENDER_DIR%\build_files\windows\configure_ninja.cmd"
        if errorlevel 1 goto EOF
 
-       call "%BLENDER_DIR%\build_files\windows\build_ninja.cmd" 
+       call "%BLENDER_DIR%\build_files\windows\build_ninja.cmd"
        if errorlevel 1 goto EOF
 )
 
-:EOF
\ No newline at end of file
+:EOF