From 85dc63a671ed0be16af32f1a5346bdbcf18836fd Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 23 Mar 2017 17:14:44 -0700 Subject: [PATCH] fix multi-line strings in VHACD and faceshift externals --- cmake/externals/faceshift/CMakeLists.txt | 8 +++----- cmake/externals/vhacd/CMakeLists.txt | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/cmake/externals/faceshift/CMakeLists.txt b/cmake/externals/faceshift/CMakeLists.txt index 2f49dab428..c4f2055435 100644 --- a/cmake/externals/faceshift/CMakeLists.txt +++ b/cmake/externals/faceshift/CMakeLists.txt @@ -28,11 +28,9 @@ if (WIN32) set(LIBRARY_PREFIX "") set(LIBRARY_EXT "lib") # use selected configuration in release path when building on Windows - set(LIBRARY_RELEASE_PATH """ - $<$:build/RelWithDebInfo> - $<$:build/MinSizeRel> - $<$,$>:lib/Release> - """) + set(LIBRARY_RELEASE_PATH "$<$:build/RelWithDebInfo>") + set(LIBRARY_RELEASE_PATH "${LIBRARY_RELEASE_PATH}$<$:build/MinSizeRel>") + set(LIBRARY_RELEASE_PATH "${LIBRARY_RELEASE_PATH}$<$,$>:lib/Release>") elseif (APPLE) set(LIBRARY_EXT "a") set(LIBRARY_PREFIX "lib") diff --git a/cmake/externals/vhacd/CMakeLists.txt b/cmake/externals/vhacd/CMakeLists.txt index 779451a304..11afa255f1 100644 --- a/cmake/externals/vhacd/CMakeLists.txt +++ b/cmake/externals/vhacd/CMakeLists.txt @@ -27,11 +27,9 @@ if (WIN32) set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/Debug/VHACD_LIB.lib CACHE FILEPATH "Path to V-HACD debug library") # use generator expression to ensure the correct library is found when building different configurations in VS - set(_LIB_FOLDER """ - $<$:build/src/VHACD_Lib/RelWithDebInfo> - $<$:build/src/VHACD_Lib/MinSizeRel> - $<$,$>:lib/Release> - """) + set(_LIB_FOLDER "$<$:build/src/VHACD_Lib/RelWithDebInfo>") + set(_LIB_FOLDER "${_LIB_FOLDER}$<$:build/src/VHACD_Lib/MinSizeRel>") + set(_LIB_FOLDER "${_LIB_FOLDER}$<$,$>:lib/Release>") set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/${_LIB_FOLDER}/VHACD_LIB.lib CACHE FILEPATH "Path to V-HACD release library") else ()