Forráskód Böngészése

Merge pull request #906 from AtomicGameEngine/JME-ATOMIC-COPYATOMICTOOL

Copy AtomicTool to artifacts post build if only building that target
JoshEngebretson 9 éve
szülő
commit
20bcc0dd04
1 módosított fájl, 13 hozzáadás és 2 törlés
  1. 13 2
      Source/AtomicTool/CMakeLists.txt

+ 13 - 2
Source/AtomicTool/CMakeLists.txt

@@ -14,6 +14,7 @@ else()
     target_link_libraries(AtomicTool libcurl)
     target_link_libraries(AtomicTool libcurl)
 endif()
 endif()
 
 
+# Custom target which is always considered out of date, checks for zero size/missing script bindings and generates
 add_custom_target( AtomicToolCheckScripts
 add_custom_target( AtomicToolCheckScripts
                    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
                    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
                    COMMAND "${CMAKE_COMMAND}" -E make_directory \"${CMAKE_SOURCE_DIR}/Artifacts/Build/AtomicTool\"
                    COMMAND "${CMAKE_COMMAND}" -E make_directory \"${CMAKE_SOURCE_DIR}/Artifacts/Build/AtomicTool\"
@@ -22,15 +23,25 @@ add_custom_target( AtomicToolCheckScripts
 
 
 add_dependencies (AtomicToolCheckScripts AtomicTool)
 add_dependencies (AtomicToolCheckScripts AtomicTool)
 
 
+# Copy AtomicTool to Artifacts
+add_custom_command( TARGET AtomicTool POST_BUILD
+                    COMMAND "${CMAKE_COMMAND}"
+                    ARGS -E make_directory \"${CMAKE_SOURCE_DIR}/Artifacts/Build/AtomicTool\"
+                    COMMAND "${CMAKE_COMMAND}"
+                    ARGS -E copy_if_different \"$<TARGET_FILE:AtomicTool>\" \"${CMAKE_SOURCE_DIR}/Artifacts/Build/AtomicTool/\"
+                    COMMENT "Copying AtomicTool to Build Artifacts" )
+
 if (MSVC)
 if (MSVC)
 
 
-# Copy the D3D shader compiler
+# Copy the D3D shader compiler (for pre-Windows 8)
 add_custom_command( TARGET AtomicTool POST_BUILD
 add_custom_command( TARGET AtomicTool POST_BUILD
                     COMMAND ${CMAKE_COMMAND}
                     COMMAND ${CMAKE_COMMAND}
                     ARGS -E copy_if_different \"${D3DCOMPILER_47_DLL}\" \"$<TARGET_FILE_DIR:AtomicTool>/D3DCompiler_47.dll\"
                     ARGS -E copy_if_different \"${D3DCOMPILER_47_DLL}\" \"$<TARGET_FILE_DIR:AtomicTool>/D3DCompiler_47.dll\"
+                    COMMAND "${CMAKE_COMMAND}"
+                    ARGS -E make_directory \"${CMAKE_SOURCE_DIR}/Artifacts/Build/AtomicTool\"
                     COMMAND ${CMAKE_COMMAND}
                     COMMAND ${CMAKE_COMMAND}
                     ARGS -E copy_if_different \"${D3DCOMPILER_47_DLL}\" \"${CMAKE_SOURCE_DIR}/Artifacts/Build/AtomicTool/D3DCompiler_47.dll\"
                     ARGS -E copy_if_different \"${D3DCOMPILER_47_DLL}\" \"${CMAKE_SOURCE_DIR}/Artifacts/Build/AtomicTool/D3DCompiler_47.dll\"
-                    COMMENT "Copying AtomicTool to Build Artifacts" )
+                    COMMENT "Copying D3DShader compiler to Build Artifacts" )
 endif(MSVC)
 endif(MSVC)
 
 
 add_custom_target ( GenerateScriptBindings
 add_custom_target ( GenerateScriptBindings