From 1a279ae85ab0863aa49ca65fde7ae1a772144a56 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Mon, 24 Dec 2018 08:37:07 -0600 Subject: [PATCH] BUG: list sub-command REMOVE_DUPLICATES requires list to be present When compiling without c++ enabled, some variables are not present. This is a check enforced in recent Cmake versions. CMake Error at CMakeModules/AddZstdCompilationFlags.cmake:54 (list): list sub-command REMOVE_DUPLICATES requires list to be present. Call Stack (most recent call first): CMakeLists.txt:53 (ADD_ZSTD_COMPILATION_FLAGS) --- .../cmake/CMakeModules/AddZstdCompilationFlags.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake index 5e65cedb..6cdf2b3a 100644 --- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake +++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake @@ -50,9 +50,11 @@ macro(ADD_ZSTD_COMPILATION_FLAGS) CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) - separate_arguments(${flag_var}) - list(REMOVE_DUPLICATES ${flag_var}) - string(REPLACE ";" " " ${flag_var} "${${flag_var}}") + if( ${flag_var} ) + separate_arguments(${flag_var}) + list(REMOVE_DUPLICATES ${flag_var}) + string(REPLACE ";" " " ${flag_var} "${${flag_var}}") + endif() endforeach () if (MSVC AND ZSTD_USE_STATIC_RUNTIME) @@ -60,7 +62,9 @@ macro(ADD_ZSTD_COMPILATION_FLAGS) CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) - string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + if ( ${flag_var} ) + string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + endif() endforeach () endif ()