[Bf-blender-cvs] [2f12b01c553] master: Fix Cmake Error.

mano-wii noreply at git.blender.org
Sun Jun 16 00:16:15 CEST 2019


Commit: 2f12b01c553b761e7e9d9f7731931dad93028dc2
Author: mano-wii
Date:   Sat Jun 15 19:16:04 2019 -0300
Branches: master
https://developer.blender.org/rB2f12b01c553b761e7e9d9f7731931dad93028dc2

Fix Cmake Error.

`LAST_EXT` only works in versions 3.14 or greater.

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

M	build_files/cmake/macros.cmake

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 4a03243af4e..5b995763111 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -189,13 +189,13 @@ function(blender_source_group
     # Group by location on disk
     source_group("Source Files" FILES CMakeLists.txt)
     foreach(_SRC ${sources})
-      get_filename_component(_SRC_EXT ${_SRC} LAST_EXT)
+      get_filename_component(_SRC_EXT ${_SRC} EXT)
       if((${_SRC_EXT} MATCHES ".h") OR
          (${_SRC_EXT} MATCHES ".hpp") OR
          (${_SRC_EXT} MATCHES ".hh"))
 
         set(GROUP_ID "Header Files")
-      elseif(${_SRC_EXT} MATCHES ".glsl")
+      elseif(${_SRC_EXT} MATCHES ".glsl$")
         set(GROUP_ID "Shaders")
       else()
         set(GROUP_ID "Source Files")



More information about the Bf-blender-cvs mailing list