Checkpoint. Correctly copying DLL/PDB.

edisonlee0212 · Sep 4, 2024 · 0105a59 · 0105a59
1 parent 6233b98
commit 0105a59
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/EvoEngine_Plugins/RayTracer/src/CpuRayTracer.cpp b/EvoEngine_Plugins/RayTracer/src/CpuRayTracer.cpp
@@ -213,7 +213,6 @@ void CpuRayTracer::Clear() noexcept {
 
 void CpuRayTracer::Initialize(const std::shared_ptr<Mesh>& input_mesh) {
   Clear();
-  assert(std::is_pod<MeshRecord>() && std::is_pod<NodeRecord>());
   geometry_instances_.resize(1);
   node_instances_.resize(1);
   geometry_instances_[0].Initialize(input_mesh);

diff --git a/EvoEngine_SDK/CMakeLists.txt b/EvoEngine_SDK/CMakeLists.txt
@@ -128,24 +128,24 @@ set(EVOENGINE_SDK_DEFS NOMINMAX PARENT_SCOPE)
 function(evoengine_sdk_copy_resources dst_target dst_dir)
 	add_custom_command(TARGET ${dst_target} POST_BUILD
 		COMMAND ${CMAKE_COMMAND} -E copy_directory
-		${EVOENGINE_SDK_DIR}/Internals
-		${dst_dir})
+		${EVOENGINE_SDK_DIR}/Internals ${dst_dir}
+		VERBATIM)
 	foreach(file_i ${EVOENGINE_SDK_DLLS})
 		add_custom_command(TARGET ${dst_target} POST_BUILD
 			COMMAND ${CMAKE_COMMAND} -E copy
-			${file_i}
-			${dst_dir})
+			${file_i} ${dst_dir} || (exit 0)
+			VERBATIM)
 	endforeach(file_i)
 	foreach(file_i ${3RDPARTY_DLLS})
 		add_custom_command(TARGET ${dst_target} POST_BUILD
 			COMMAND ${CMAKE_COMMAND} -E copy
-			${file_i}
-			${dst_dir})
+			${file_i} ${dst_dir} || (exit 0)
+			VERBATIM)
 	endforeach(file_i)
 	foreach(file_i ${3RDPARTY_PDBS})
 		add_custom_command(TARGET ${dst_target} POST_BUILD
 			COMMAND ${CMAKE_COMMAND} -E copy
-			${file_i}
-			${dst_dir})
+			${file_i} ${dst_dir} || (exit 0)
+			VERBATIM)
 	endforeach(file_i)
 endfunction()
diff --git a/Extern/3rdParty/assimp/CMakeLists.txt b/Extern/3rdParty/assimp/CMakeLists.txt
@@ -44,8 +44,10 @@ set(3RDPARTY_INCLUDES ${3RDPARTY_INCLUDES}
 
 set(3RDPARTY_DLLS ${3RDPARTY_DLLS} 
     ${CMAKE_CURRENT_BINARY_DIR}/assimp/bin/assimp-vc143-mt.dll
+    ${CMAKE_CURRENT_BINARY_DIR}/assimp/bin/$<CONFIGURATION>/assimp-vc143-mt.dll
     PARENT_SCOPE)
 
 set(3RDPARTY_PDBS ${3RDPARTY_PDBS} 
     ${CMAKE_CURRENT_BINARY_DIR}/assimp/bin/assimp-vc143-mt.pdb
+    ${CMAKE_CURRENT_BINARY_DIR}/assimp/bin/$<CONFIGURATION>/assimp-vc143-mt.pdb
     PARENT_SCOPE)
diff --git a/Extern/3rdParty/zlib/CMakeLists.txt b/Extern/3rdParty/zlib/CMakeLists.txt
@@ -29,8 +29,10 @@ set(3RDPARTY_INCLUDES ${3RDPARTY_INCLUDES} ${ZLIB_INCLUDE_DIR} PARENT_SCOPE)
 
 set(3RDPARTY_DLLS ${3RDPARTY_DLLS} 
     ${CMAKE_CURRENT_BINARY_DIR}/zlib/zlib1.dll
+    ${CMAKE_CURRENT_BINARY_DIR}/zlib/$<CONFIGURATION>/zlib1.dll
     PARENT_SCOPE)
 
 set(3RDPARTY_PDBS ${3RDPARTY_PDBS} 
     ${CMAKE_CURRENT_BINARY_DIR}/zlib/zlib.pdb
+    ${CMAKE_CURRENT_BINARY_DIR}/zlib/$<CONFIGURATION>/zlib.pdb
     PARENT_SCOPE)