diff options
| author | Bryan Galdrikian <[email protected]> | 2017-10-24 15:25:02 -0700 |
|---|---|---|
| committer | Bryan Galdrikian <[email protected]> | 2017-10-24 15:25:02 -0700 |
| commit | b0c11962f6012430da3bcaa2727288046b33d648 (patch) | |
| tree | cf13338fa4fd7072badf64f751f94abeeb437003 /test/compiler/cmake | |
| parent | linux build fix - all configs (diff) | |
| download | blast-b0c11962f6012430da3bcaa2727288046b33d648.tar.xz blast-b0c11962f6012430da3bcaa2727288046b33d648.zip | |
Changes for 1.1.1
See README.md
Diffstat (limited to 'test/compiler/cmake')
| -rw-r--r-- | test/compiler/cmake/BlastPerfTests.cmake | 3 | ||||
| -rw-r--r-- | test/compiler/cmake/BlastUnitTests.cmake | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/compiler/cmake/BlastPerfTests.cmake b/test/compiler/cmake/BlastPerfTests.cmake index 7c17c04..3399b7b 100644 --- a/test/compiler/cmake/BlastPerfTests.cmake +++ b/test/compiler/cmake/BlastPerfTests.cmake @@ -24,6 +24,7 @@ SET(PERF_SOURCE_FILES ${PERF_SOURCE_DIR}/BlastBasePerfTest.h ${PERF_SOURCE_DIR}/SolverPerfTests.cpp + ${PERF_SOURCE_DIR}/DamagePerfTests.cpp ) SET(SDK_COMMON_FILES @@ -134,7 +135,7 @@ TARGET_COMPILE_OPTIONS(BlastPerfTests TARGET_LINK_LIBRARIES(BlastPerfTests - PRIVATE NvBlastExtShaders NvBlastTk ${GOOGLETEST_LIBRARIES} + PRIVATE NvBlastExtShaders NvBlastTk NvBlastExtSerialization ${GOOGLETEST_LIBRARIES} PRIVATE ${BLASTPERFTESTS_PLATFORM_LINKED_LIBS} ) diff --git a/test/compiler/cmake/BlastUnitTests.cmake b/test/compiler/cmake/BlastUnitTests.cmake index 30ee9b4..0344264 100644 --- a/test/compiler/cmake/BlastUnitTests.cmake +++ b/test/compiler/cmake/BlastUnitTests.cmake @@ -124,7 +124,8 @@ TARGET_INCLUDE_DIRECTORIES(BlastUnitTests PRIVATE ${BLAST_ROOT_DIR}/sdk/profiler PRIVATE ${BLAST_ROOT_DIR}/sdk/lowlevel/include PRIVATE ${BLAST_ROOT_DIR}/sdk/lowlevel/source - PRIVATE ${BLAST_ROOT_DIR}/sdk/extensions/serialization/source + PRIVATE ${BLAST_ROOT_DIR}/sdk/extensions/assetutils/source + PRIVATE ${BLAST_ROOT_DIR}/sdk/extensions/assetutils/include PRIVATE ${BLAST_ROOT_DIR}/sdk/extensions/serialization/include PRIVATE ${BLAST_ROOT_DIR}/shared/utils @@ -155,7 +156,7 @@ MESSAGE("UnitTests LL: ${BLASTUNITTESTS_PLATFORM_LINKED_LIBS}") # Do final direct sets after the target has been defined TARGET_LINK_LIBRARIES(BlastUnitTests - PRIVATE NvBlastExtShaders NvBlastExtPhysX NvBlastTk NvBlastExtSerialization ${GOOGLETEST_LIBRARIES} + PRIVATE NvBlastExtShaders NvBlastExtPhysX NvBlastTk NvBlastExtSerialization NvBlastExtAssetUtils ${GOOGLETEST_LIBRARIES} PRIVATE ${BLASTUNITTESTS_PLATFORM_LINKED_LIBS} PUBLIC $<$<CONFIG:debug>:${PXFOUNDATION_LIB_DEBUG}> $<$<CONFIG:debug>:${PXTASK_LIB_DEBUG}> |