Merge branch 'development' into 'development'
Doxygen generation fix, small cleanup
See merge request gpuopen/GPUOpen-LibrariesAndSDKs/d3d12memoryallocator!2
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 616dc9f..f5daf96 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,11 +52,13 @@
set_source_files_properties( ${VERTEX_SHADERS}
PROPERTIES
VS_SHADER_TYPE Vertex
+ VS_SETTINGS "ExcludedFromBuild=true"
)
set_source_files_properties( ${PIXEL_SHADERS}
PROPERTIES
VS_SHADER_TYPE Pixel
+ VS_SETTINGS "ExcludedFromBuild=true"
)
add_executable(D3D12Sample ${D3D12_SAMPLE_SOURCE_FILES} ${SHADERS})
@@ -101,7 +103,3 @@
message(STATUS "D3D12Sample application is not supported to Linux")
endif()
endif()
-
-if(D3D12MA_BUILD_SAMPLE_SHADERS)
-# add_subdirectory(Shaders)
-endif()
\ No newline at end of file
diff --git a/src/Doxyfile b/src/Doxyfile
index e173f31..b0dd0bd 100644
--- a/src/Doxyfile
+++ b/src/Doxyfile
@@ -58,7 +58,7 @@
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = ../docs
+OUTPUT_DIRECTORY = @CMAKE_SOURCE_DIR@/docs
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -823,7 +823,7 @@
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.
-INPUT = @CMAKE_CURRENT_SOURCE_DIR@/src/D3D12MemAlloc.h
+INPUT = @CMAKE_SOURCE_DIR@/src/D3D12MemAlloc.h
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
