Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 03:42:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix multi-line strings in VHACD and faceshift externals

Browse source
This commit is contained in:
Stephen Birarda 2017-03-23 17:14:44 -07:00
parent 22c7d4032b
commit 85dc63a671
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmake/externals/faceshift/CMakeLists.txt vendored
View file

@ -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 """
$<$<CONFIG:RelWithDebInfo>:build/RelWithDebInfo>
$<$<CONFIG:MinSizeRel>:build/MinSizeRel>
$<$<OR:<$<CONFIG:Release>,$<CONFIG:Debug>>:lib/Release>
""")
set(LIBRARY_RELEASE_PATH "$<$<CONFIG:RelWithDebInfo>:build/RelWithDebInfo>")
set(LIBRARY_RELEASE_PATH "${LIBRARY_RELEASE_PATH}$<$<CONFIG:MinSizeRel>:build/MinSizeRel>")
set(LIBRARY_RELEASE_PATH "${LIBRARY_RELEASE_PATH}$<$<OR:$<CONFIG:Release>,$<CONFIG:Debug>>:lib/Release>")
elseif (APPLE)
set(LIBRARY_EXT "a")
set(LIBRARY_PREFIX "lib")

8
cmake/externals/vhacd/CMakeLists.txt vendored
View file

@ -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 """
$<$<CONFIG:RelWithDebInfo>:build/src/VHACD_Lib/RelWithDebInfo>
$<$<CONFIG:MinSizeRel>:build/src/VHACD_Lib/MinSizeRel>
$<$<OR:$<CONFIG:Release>,$<CONFIG:Debug>>:lib/Release>
""")
set(_LIB_FOLDER "$<$<CONFIG:RelWithDebInfo>:build/src/VHACD_Lib/RelWithDebInfo>")
set(_LIB_FOLDER "${_LIB_FOLDER}$<$<CONFIG:MinSizeRel>:build/src/VHACD_Lib/MinSizeRel>")
set(_LIB_FOLDER "${_LIB_FOLDER}$<$<OR:$<CONFIG:Release>,$<CONFIG:Debug>>:lib/Release>")
set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/${_LIB_FOLDER}/VHACD_LIB.lib CACHE FILEPATH "Path to V-HACD release library")
else ()