Commit ac5c96e4153d059ad76174db83522641bb4b2b9f - DiligentTools

+4

-0

AssetLoader/CMakeLists.txt less more

43	43	set_target_properties(Diligent-AssetLoader PROPERTIES
44	44	FOLDER DiligentTools
45	45	)
	46
	47	if(INSTALL_DILIGENT_TOOLS)
	48	install_tools_lib(Diligent-AssetLoader)
	49	endif()

+4

-4

AssetLoader/interface/GLTFLoader.h less more

25	25	#include <vector>
26	26	#include <memory>
27	27
28		#include "RefCntAutoPtr.h"
29		#include "RenderDevice.h"
30		#include "DeviceContext.h"
31		#include "AdvancedMath.h"
	28	#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
	29	#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
	30	#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.h"
	31	#include "../../../DiligentCore/Common/interface/AdvancedMath.h"
32	32
33	33	namespace tinygltf
34	34	{

+45

-0

CMakeLists.txt less more

0	0	cmake_minimum_required (VERSION 3.6)
1	1
2	2	option(DILIGENT_BUILD_RENDER_SCRIPT "Build render script" ON)
	3
	4	file(RELATIVE_PATH DILIGENT_TOOLS_DIR "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
	5
	6	if(NOT INSTALL_DILIGENT_TOOLS)
	7	set(INSTALL_DILIGENT_TOOLS ${INSTALL_DILIGENT_CORE})
	8	endif()
	9
	10	function(install_tools_lib _TARGET)
	11	get_target_relative_dir(${_TARGET} TARGET_RELATIVE_PATH)
	12
	13	get_target_property(TARGET_TYPE ${_TARGET} TYPE)
	14	if(TARGET_TYPE STREQUAL STATIC_LIBRARY)
	15	list(APPEND DILIGENT_TOOLS_INSTALL_LIBS_LIST ${_TARGET})
	16	set(DILIGENT_TOOLS_INSTALL_LIBS_LIST ${DILIGENT_TOOLS_INSTALL_LIBS_LIST} CACHE INTERNAL "Diligent tools libraries installation list")
	17	elseif(TARGET_TYPE STREQUAL SHARED_LIBRARY)
	18	install(TARGETS ${_TARGET}
	19	ARCHIVE DESTINATION "lib/${DILIGENT_TOOLS_DIR}/$<CONFIG>"
	20	LIBRARY DESTINATION "bin/${DILIGENT_TOOLS_DIR}/$<CONFIG>"
	21	RUNTIME DESTINATION "bin/${DILIGENT_TOOLS_DIR}/$<CONFIG>"
	22	)
	23	if (DILIGENT_INSTALL_PDB)
	24	install(FILES $<TARGET_PDB_FILE:${_TARGET}> DESTINATION "bin/${DILIGENT_TOOLS_DIR}/$<CONFIG>" OPTIONAL)
	25	endif()
	26	endif()
	27
	28	if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/interface")
	29	install(DIRECTORY interface
	30	DESTINATION "headers/${TARGET_RELATIVE_PATH}/"
	31	)
	32	endif()
	33	endfunction()
3	34
4	35	add_subdirectory(ThirdParty)
5	36	add_subdirectory(TextureLoader)

14	45	if(PLATFORM_WIN32 AND GL_SUPPORTED)
15	46	add_subdirectory(HLSL2GLSLConverter)
16	47	endif()
	48
	49	# Installation instructions
	50	if(INSTALL_DILIGENT_TOOLS)
	51
	52	install_combined_static_lib(
	53	"${CMAKE_STATIC_LIBRARY_PREFIX}DiligentTools${CMAKE_STATIC_LIBRARY_SUFFIX}"
	54	"${DILIGENT_TOOLS_INSTALL_LIBS_LIST}"
	55	DiligentTools-static # Custom target name
	56	DiligentTools # Folder
	57	"lib/${DILIGENT_TOOLS_DIR}/$<CONFIG>" # Install destination
	58	)
	59
	60	install(FILES License.txt DESTINATION "Licenses/${DILIGENT_TOOLS_DIR}" RENAME DiligentEngine-License.txt)
	61	endif()

+6

-0

HLSL2GLSLConverter/CMakeLists.txt less more

34	34	set_target_properties(HLSL2GLSLConverter PROPERTIES
35	35	FOLDER DiligentTools
36	36	)
	37
	38	install(TARGETS HLSL2GLSLConverter
	39	ARCHIVE DESTINATION "lib/${DILIGENT_TOOLS_DIR}/$<CONFIG>"
	40	LIBRARY DESTINATION "lib/${DILIGENT_TOOLS_DIR}/$<CONFIG>"
	41	RUNTIME DESTINATION "bin/${DILIGENT_TOOLS_DIR}/$<CONFIG>"
	42	)

+4

-0

Imgui/CMakeLists.txt less more

100	100	set_target_properties(Diligent-Imgui PROPERTIES
101	101	FOLDER DiligentTools
102	102	)
	103
	104	if(INSTALL_DILIGENT_TOOLS)
	105	install_tools_lib(Diligent-Imgui)
	106	endif()

+2

-2

Imgui/interface/ImGuiUtils.h less more

25	25	#include <algorithm>
26	26	#include <limits>
27	27
28		#include "imgui.h"
29		#include "imgui_internal.h"
	28	#include "../../ThirdParty/imgui/imgui.h"
	29	#include "../../ThirdParty/imgui/imgui_internal.h"
30	30
31	31	namespace Diligent
32	32	{

+5

-1

TextureLoader/CMakeLists.txt less more

50	50
51	51	set_target_properties(Diligent-TextureLoader PROPERTIES
52	52	FOLDER DiligentTools
53		)⏎
	53	)
	54
	55	if(INSTALL_DILIGENT_TOOLS)
	56	install_tools_lib(Diligent-TextureLoader)
	57	endif()

+24

-0

ThirdParty/CMakeLists.txt less more

16	16	install(FILES zlib-1.2.8/README DESTINATION ${LICENSE_INSTALL_PATH} RENAME zlib-readme.txt)
17	17	install(FILES imgui/LICENSE.txt DESTINATION ${LICENSE_INSTALL_PATH} RENAME imgui-license.txt)
18	18	install(FILES imGuIZMO.quat/license.txt DESTINATION ${LICENSE_INSTALL_PATH} RENAME imGuIZMO.quat-license.txt)
	19
	20	if(INSTALL_DILIGENT_TOOLS)
	21	set(THIRD_PARTY_TARGETS LibJpeg LibPng LibTiff Lua ZLib)
	22	install(TARGETS ${THIRD_PARTY_TARGETS}
	23	ARCHIVE DESTINATION "lib/${DILIGENT_TOOLS_DIR}/$<CONFIG>"
	24	LIBRARY DESTINATION "lib/${DILIGENT_TOOLS_DIR}/$<CONFIG>"
	25	RUNTIME DESTINATION "bin/${DILIGENT_TOOLS_DIR}/$<CONFIG>"
	26	)
	27
	28	list(APPEND DILIGENT_TOOLS_INSTALL_LIBS_LIST ${THIRD_PARTY_TARGETS})
	29	set(DILIGENT_TOOLS_INSTALL_LIBS_LIST ${DILIGENT_TOOLS_INSTALL_LIBS_LIST} CACHE INTERNAL "Diligent tools libraries installation list")
	30
	31	install(
	32	FILES
	33	imgui/imconfig.h
	34	imgui/imgui.h
	35	imgui/imgui_internal.h
	36	imgui/imstb_rectpack.h
	37	imgui/imstb_textedit.h
	38	imgui/imstb_truetype.h
	39	DESTINATION
	40	"headers/${THIRD_PARTY_DIR}/imgui"
	41	)
	42	endif()