From 505905ab7d8cb8a7c8999e24f13d220696f366f7 Mon Sep 17 00:00:00 2001 From: Koncord Date: Tue, 18 Apr 2017 16:49:21 +0800 Subject: [PATCH] [General] Allow backslashes in add_openmw_dir to specify subgroups --- cmake/OpenMWMacros.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/OpenMWMacros.cmake b/cmake/OpenMWMacros.cmake index c5669fa70..37c61aebc 100644 --- a/cmake/OpenMWMacros.cmake +++ b/cmake/OpenMWMacros.cmake @@ -19,17 +19,19 @@ endfunction(enable_unity_build) macro (add_openmw_dir dir) set (files) set (cppfiles) + + string(REGEX REPLACE "\\\\" "/" newDir ${dir}) foreach (u ${ARGN}) # Add cpp and hpp to OPENMW_FILES - file (GLOB ALL "${dir}/${u}.[ch]pp") + file (GLOB ALL "${newDir}/${u}.[ch]pp") foreach (f ${ALL}) list (APPEND files "${f}") list (APPEND OPENMW_FILES "${f}") endforeach (f) # Add cpp to unity build - file (GLOB ALL "${dir}/${u}.cpp") + file (GLOB ALL "${newDir}/${u}.cpp") foreach (f ${ALL}) list (APPEND cppfiles "${f}") endforeach (f) @@ -37,8 +39,8 @@ macro (add_openmw_dir dir) endforeach (u) if (OPENMW_UNITY_BUILD) - enable_unity_build(${dir} "${cppfiles}") - list (APPEND OPENMW_FILES ${CMAKE_CURRENT_BINARY_DIR}/ub_${dir}.cpp) + enable_unity_build(${newDir} "${cppfiles}") + list (APPEND OPENMW_FILES ${CMAKE_CURRENT_BINARY_DIR}/ub_${newDir}.cpp) endif() source_group ("apps\\openmw\\${dir}" FILES ${files})