Fix/Workaround a cmake path seperator escaping bug on Windows

2014-01-25 21:35:44 +01:00
parent 4bf0855590
commit cfc3609a4e
2 changed files with 38 additions and 13 deletions
--- a/cmake/Modules/ObsHelpers.cmake
+++ b/cmake/Modules/ObsHelpers.cmake
@@ -19,6 +19,14 @@ if(INSTALLER_RUN AND NOT DEFINED ENV{obsInstallerTempDir})
 	message(FATAL_ERROR "Environment variable obsInstallerTempDir is needed for multiarch installer generation")
 endif()

+if(DEFINED ENV{obsInstallerTempDir})
+	file(TO_CMAKE_PATH "$ENV{obsInstallerTempDir}" ENV{obsInstallerTempDir})
+endif()
+
+if(DEFINED ENV{obsAdditionalInstallFiles})
+	file(TO_CMAKE_PATH "$ENV{obsAdditionalInstallFiles}" ENV{obsAdditionalInstallFiles})
+endif()
+
 if(NOT UNIX_STRUCTURE)
 	set(OBS_DATA_DESTINATION "data")
 	if(APPLE)