Merge pull request #9878 from hudokkow/cmake_managestring

[cmake] get rid of ManageString.cmake
xbmc · Jun 1, 2016 · 59af8c9 · 59af8c9
2 parents eaaf192 + 2302fd3
commit 59af8c9
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 238 deletions.
diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt
@@ -65,7 +65,6 @@ include(scripts/common/GeneratorSetup.cmake)
 include(scripts/common/AddOptions.cmake)
 include(scripts/common/ArchSetup.cmake)
 include(scripts/common/Macros.cmake)
-include(scripts/common/ManageString.cmake)
 include(scripts/common/ProjectMacros.cmake)
 include(scripts/common/PathSetup.cmake)
 include(ExternalProject)

diff --git a/project/cmake/installdata/cmake-files.txt b/project/cmake/installdata/cmake-files.txt
@@ -7,7 +7,6 @@ project/cmake/scripts/common/GenerateVersionedFiles.cmake
 project/cmake/scripts/common/GeneratorSetup.cmake
 project/cmake/scripts/common/HandleDepends.cmake
 project/cmake/scripts/common/Macros.cmake
-project/cmake/scripts/common/ManageString.cmake
 project/cmake/scripts/common/PathSetup.cmake
 project/cmake/scripts/common/PrepareEnv.cmake
 project/cmake/scripts/common/ProjectMacros.cmake
diff --git a/project/cmake/scripts/common/Macros.cmake b/project/cmake/scripts/common/Macros.cmake
@@ -260,7 +260,7 @@ function(core_add_subdirs_from_filelist files)
     string(STRIP ${filename} filename)
     core_file_read_filtered(fstrings ${filename})
     foreach(subdir ${fstrings})
-      STRING_SPLIT(subdir " " ${subdir})
+      string(REPLACE " " ";" subdir ${subdir})
       list(GET subdir  0 subdir_src)
       list(GET subdir -1 subdir_dest)
       if(VERBOSE)

diff --git a/project/cmake/scripts/common/ManageString.cmake b/project/cmake/scripts/common/ManageString.cmake