[Bf-blender-cvs] [82afc58f916] master: CMake: cleanup, unset temporary var after use

Campbell Barton noreply at git.blender.org
Tue Jun 18 23:32:53 CEST 2019


Commit: 82afc58f91629ddfefbd1f8fe059343577837294
Author: Campbell Barton
Date:   Wed Jun 19 07:12:16 2019 +1000
Branches: master
https://developer.blender.org/rB82afc58f91629ddfefbd1f8fe059343577837294

CMake: cleanup, unset temporary var after use

===================================================================

M	build_files/cmake/macros.cmake

===================================================================

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index f65dd174486..4095b7bc815 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -179,12 +179,13 @@ function(blender_source_group
       # remove ../'s
       get_filename_component(_SRC_DIR ${_SRC} REALPATH)
       get_filename_component(_SRC_DIR ${_SRC_DIR} DIRECTORY)
-      string(FIND ${_SRC_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/" _POS)
-      if(NOT _POS EQUAL -1)
+      string(FIND ${_SRC_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/" _pos)
+      if(NOT _pos EQUAL -1)
         string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" GROUP_ID ${_SRC_DIR})
         string(REPLACE "/" "\\" GROUP_ID ${GROUP_ID})
         source_group("${GROUP_ID}" FILES ${_SRC})
       endif()
+      unset(_pos)
     endforeach()
   else()
     # Group by location on disk
@@ -954,6 +955,7 @@ function(delayed_install
     endif()
     set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_DESTINATIONS ${destination})
   endforeach()
+  unset(f)
 endfunction()
 
 # note this is a function instead of a macro so that ${BUILD_TYPE} in targetdir



More information about the Bf-blender-cvs mailing list