diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | install.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 29674c383..1e84884f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -496,7 +496,7 @@ macro(add_to_cpack_ignored_files ITEM) endmacro(add_to_cpack_ignored_files) # Add the initial files to ignore which will be ignored regardless of if you are building in-source or out-of-source -add_to_cpack_ignored_files(".git\;config.cache\;.svn\;CMakeFiles\;sysconf.h$\;Makefile.inc$\;config.log\;config.status" TRUE) +add_to_cpack_ignored_files(".git\;config.cache\;.svn\;CMakeFiles\;sysconf.h$\;Makefile.inc$\;config.log\;config.status\;build" TRUE) # Add the files we don't want the periods converted for add_to_cpack_ignored_files(".\\\\\\\\.so$;.\\\\\\\\.o$;.\\\\\\\\.s$;${Anope_SOURCE_DIR}/Makefile$") # If the two directories are the same, we are building in-source, thus we need to ignore more files from the build diff --git a/install.js b/install.js index e136257c5..fc5d21e65 100644 --- a/install.js +++ b/install.js @@ -214,7 +214,8 @@ for (x in installerQuestions) { var thisQuestion = installerQuestions[x]; cmake += ' ' + thisQuestion.cmake_argument(); } -cmake += ' "' + ScriptPath + '"'; +var fixedScriptPath = ScriptPath.replace(/\\/g, '/'); +cmake += ' "' + fixedScriptPath + '"'; WScript.Echo(cmake + "\n"); var shell = WScript.CreateObject('WScript.Shell'); |