Skip to content

Commit

Permalink
Checkpoint.
Browse files Browse the repository at this point in the history
  • Loading branch information
edisonlee0212 committed Sep 4, 2024
1 parent eca4cf8 commit e12ae75
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 7 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
# ------------------------------------------------------------------

set(3RDPARTY_INCLUDES "")
set(3RDPARTY_DLLS "")
set(3RDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Extern/3rdParty)
add_subdirectory(${3RDPARTY_DIR})

Expand Down
19 changes: 18 additions & 1 deletion EvoEngine_SDK/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,22 @@ function(evoengine_sdk_copy_resources dst_target dst_dir)
COMMAND ${CMAKE_COMMAND} -E copy_directory
${EVOENGINE_SDK_DIR}/Internals
${dst_dir})

foreach(file_i ${EVOENGINE_SDK_DLLS})
add_custom_command(TARGET ${dst_target} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
${file_i}
${dst_dir})
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})
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})
endforeach(file_i)
endfunction()
20 changes: 17 additions & 3 deletions Extern/3rdParty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ else()
endforeach()
endif()

function(message)
if (NOT 3RDPARTY_SURPRESS_ALL_MESSAGES)
_message(${ARGN})
endif()
endfunction()
set(3RDPARTY_SURPRESS_ALL_MESSAGES ON)

add_subdirectory(zlib EXCLUDE_FROM_ALL)

add_subdirectory(assimp EXCLUDE_FROM_ALL)
Expand All @@ -46,9 +53,8 @@ add_subdirectory(volk EXCLUDE_FROM_ALL)
add_subdirectory(VulkanMemoryAllocator EXCLUDE_FROM_ALL)
add_subdirectory(xatlas EXCLUDE_FROM_ALL)
add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
set(SHADERC_DIR
${CMAKE_CURRENT_SOURCE_DIR}/shaderc/shaderc
PARENT_SCOPE)

unset(3RDPARTY_SURPRESS_ALL_MESSAGES)

# Turn off warnings for 3rd party code, part 1. Some projects set their own warnings by compile options.
# Need to turn them off as well.
Expand Down Expand Up @@ -83,4 +89,12 @@ endforeach()
set(3RDPARTY_INCLUDES
${CMAKE_CURRENT_SOURCE_DIR}
${3RDPARTY_INCLUDES}
PARENT_SCOPE)

set(3RDPARTY_DLLS
${3RDPARTY_DLLS}
PARENT_SCOPE)

set(3RDPARTY_PDBS
${3RDPARTY_PDBS}
PARENT_SCOPE)
8 changes: 8 additions & 0 deletions Extern/3rdParty/assimp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,12 @@ set_target_properties(assimp PROPERTIES FOLDER "3rdparty")
set(3RDPARTY_INCLUDES ${3RDPARTY_INCLUDES}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/assimp/include
PARENT_SCOPE)

set(3RDPARTY_DLLS ${3RDPARTY_DLLS}
${CMAKE_CURRENT_BINARY_DIR}/assimp/bin/assimp-vc143-mt.dll
PARENT_SCOPE)

set(3RDPARTY_PDBS ${3RDPARTY_PDBS}
${CMAKE_CURRENT_BINARY_DIR}/assimp/bin/assimp-vc143-mt.pdb
PARENT_SCOPE)
12 changes: 10 additions & 2 deletions Extern/3rdParty/zlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set(BUILD_SHARED_LIBS ON)
set(SKIP_INSTALL_ALL ON CACHE BOOL "" FORCE)
set(ZLIB_BUILD_EXAMPLES OFF CACHE INTERNAL "" FORCE)

add_subdirectory(zlib)
add_subdirectory(zlib EXCLUDE_FROM_ALL)

# Redirect the find_packge(zlib) to this directory
set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB FALSE CACHE BOOL "" FORCE)
Expand All @@ -25,4 +25,12 @@ add_library(ZLIB::ZLIB ALIAS zlib)

set_target_properties(zlib PROPERTIES FOLDER "3rdparty")

set(3RDPARTY_INCLUDES ${3RDPARTY_INCLUDES} ${ZLIB_INCLUDE_DIR} PARENT_SCOPE)
set(3RDPARTY_INCLUDES ${3RDPARTY_INCLUDES} ${ZLIB_INCLUDE_DIR} PARENT_SCOPE)

set(3RDPARTY_DLLS ${3RDPARTY_DLLS}
${CMAKE_CURRENT_BINARY_DIR}/zlib/zlib1.dll
PARENT_SCOPE)

set(3RDPARTY_PDBS ${3RDPARTY_PDBS}
${CMAKE_CURRENT_BINARY_DIR}/zlib/zlib.pdb
PARENT_SCOPE)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
asset_extension_: .nsld
asset_file_name_: Basic
asset_type_name_: Binary
asset_handle_: 9398108041051358471
asset_handle_: 13224380923183300279

0 comments on commit e12ae75

Please sign in to comment.