瀏覽代碼

* BugFix: Correct an error that can cause portions of the template to not be copied.

Robert MacGregor 3 年之前
父節點
當前提交
372a79c8f7
共有 1 個文件被更改,包括 4 次插入5 次删除
  1. 4 5
      Templates/BaseGame/CMakeLists.txt

+ 4 - 5
Templates/BaseGame/CMakeLists.txt

@@ -5,7 +5,7 @@ endforeach()
 
 # Perform installation minus scripts
 file(COPY "game" "source" DESTINATION "${TORQUE_APP_ROOT_DIRECTORY}" PATTERN "*.tscript" EXCLUDE PATTERN
-                                                                     PATTERN "*.in" EXCLUDE PATTERN)
+                                                                     PATTERN "*.in" EXCLUDE PATTERN)	
 # Enumerate scripts and install with extension
 file(GLOB_RECURSE SCRIPT_FILES "game/*.tscript")
 foreach(ITEM ${SCRIPT_FILES})
@@ -15,10 +15,9 @@ foreach(ITEM ${SCRIPT_FILES})
     STRING(REGEX REPLACE "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/" "${TORQUE_APP_ROOT_DIRECTORY}/" INSTALL_DIR ${dir})
     STRING(REGEX REPLACE ".tscript" ".${TORQUE_SCRIPT_EXTENSION}" newScriptName ${scriptName})
 
-    # We can't use the file(COPY command to copy to a new file name so we copy as-is first then rename
-    file(COPY ${ITEM} DESTINATION ${INSTALL_DIR})
-    file(RENAME ${INSTALL_DIR}/${scriptName} ${INSTALL_DIR}/${newScriptName})
+    # Copy the file and perform a rename at the same time
+    file(COPY_FILE ${ITEM} ${INSTALL_DIR}/${newScriptName})
 endforeach()
 
 # Once the full tree is installed, perform configurations
-CONFIGURE_FILE("game/main.tscript.in" "${TORQUE_APP_GAME_DIRECTORY}/main.${TORQUE_SCRIPT_EXTENSION}")
+CONFIGURE_FILE("game/main.tscript.in" "${TORQUE_APP_GAME_DIRECTORY}/main.${TORQUE_SCRIPT_EXTENSION}")