Improvements in CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index de4cfa8..f51b781 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,22 +8,24 @@
option(BUILD_DOCUMENTATION "Create and install the HTML-based API documentation (requires Doxygen)" OFF)
option(BUILD_SHARED_LIBS "Build D3D12 Memory Allocator shared library" OFF)
-if (DOXYGEN_FOUND AND BUILD_DOCUMENTATION)
- # set input and output files
- set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/src/Doxyfile)
- set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+if(BUILD_DOCUMENTATION)
+ if(DOXYGEN_FOUND)
+ # set input and output files
+ set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/src/Doxyfile)
+ set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
- # request to configure the file
- configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
- # note the option ALL which allows to build the docs together with the application
- add_custom_target( doc_doxygen ALL
- COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "Generating API documentation with Doxygen"
- VERBATIM )
-else (DOXYGEN_FOUND AND BUILD_DOCUMENTATION)
- message("Doxygen need to be installed to generate the doxygen documentation")
-endif (DOXYGEN_FOUND AND BUILD_DOCUMENTATION)
+ # request to configure the file
+ configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
+ # note the option ALL which allows to build the docs together with the application
+ add_custom_target( doc_doxygen ALL
+ COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ COMMENT "Generating API documentation with Doxygen"
+ VERBATIM )
+ else()
+ message("Doxygen need to be installed to generate the doxygen documentation")
+ endif()
+endif()
# D3D12MemoryAllocator contains an sample application which is not build by default
option(D3D12MA_BUILD_SAMPLE "Build D3D12MemoryAllocator sample application" OFF)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7bf39de..a2e1b12 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
set(D3D12MA_LIBRARY_SOURCE_FILES
- ../include/D3D12MemAlloc.h
+ "../include/D3D12MemAlloc.h"
D3D12MemAlloc.cpp
)
set(CMAKE_DEBUG_POSTFIX d)
@@ -40,18 +40,20 @@
if (D3D12MA_BUILD_SAMPLE)
if(WIN32)
+ set(SHADER_DIR "Shaders")
+
set(D3D12_SAMPLE_SOURCE_FILES
Common.cpp
Tests.cpp
D3D12Sample.cpp
)
- set( VERTEX_SHADERS
- Shaders/VS.hlsl
+ set(VERTEX_SHADERS
+ "${SHADER_DIR}/VS.hlsl"
)
- set( PIXEL_SHADERS
- Shaders/PS.hlsl
+ set(PIXEL_SHADERS
+ "${SHADER_DIR}/PS.hlsl"
)
set( SHADERS
