summaryrefslogtreecommitdiff
path: root/compiler/cmake/NvWaveWorks.cmake
diff options
context:
space:
mode:
authorJason Maskell <[email protected]>2016-05-31 11:24:52 +0200
committerJason Maskell <[email protected]>2016-05-31 11:24:52 +0200
commit999fd20ca96b8d44d3ce418f118fb3b846038978 (patch)
treefc86969d4eb006f592560e7bd425b9a2db865be2 /compiler/cmake/NvWaveWorks.cmake
parentAdded path to opengl media search path. Removed commented out code left over ... (diff)
downloadwaveworks_archive-999fd20ca96b8d44d3ce418f118fb3b846038978.tar.xz
waveworks_archive-999fd20ca96b8d44d3ce418f118fb3b846038978.zip
Added support for RFC 104, the logging interface: https://docs.google.com/document/d/102b8k5pKYj9e-tMmG53aT5izur-qfUSPX1gBro4gN0Q/edit
Added a dumb implementation of the logger in the D3D11 sample. Added a method to the WaveWorks API to allow the user to set (override) the internal logger with their own supplied nv::ILogger derived object.
Diffstat (limited to 'compiler/cmake/NvWaveWorks.cmake')
-rw-r--r--compiler/cmake/NvWaveWorks.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/cmake/NvWaveWorks.cmake b/compiler/cmake/NvWaveWorks.cmake
index 87b62d8..9ac0d91 100644
--- a/compiler/cmake/NvWaveWorks.cmake
+++ b/compiler/cmake/NvWaveWorks.cmake
@@ -9,6 +9,7 @@ SET(WW_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src)
SET(SHADER_SRC_DIR ${WW_SOURCE_DIR}/shader)
SET(DISTRO_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
SET(GEN_SRC_DIR ${WW_SOURCE_DIR}/generated)
+SET(COMMON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/common)
IF(TARGET_BUILD_PLATFORM STREQUAL "Windows")
@@ -112,6 +113,9 @@ SET(H_FILES
${WW_SOURCE_DIR}/Simulation_impl.h
${WW_SOURCE_DIR}/Simulation_Util.h
${WW_SOURCE_DIR}/Spectrum_Util.h
+
+ ${WW_SOURCE_DIR}/InternalLogger.h
+ ${WW_SOURCE_DIR}/InternalLogger.cpp
)
SET(DISTRO_INCLUDE_FILES
@@ -252,6 +256,7 @@ TARGET_INCLUDE_DIRECTORIES(WaveWorks
PRIVATE ${WW_PLATFORM_INCLUDES}
PRIVATE ${CUDA_INCLUDE_DIRS}
PRIVATE ${GEN_SRC_DIR}
+ PRIVATE ${COMMON_SOURCE_DIR}
PRIVATE ${PROJECT_SOURCE_DIR}/include
PRIVATE ${SHADER_SRC_DIR}