From 7115f60b91b5717d90f643fd692010905c7004db Mon Sep 17 00:00:00 2001 From: Bryan Galdrikian Date: Thu, 31 May 2018 11:36:08 -0700 Subject: Blast 1.1.3. See docs/release_notes.txt. --- test/compiler/cmake/BlastUnitTests.cmake | 349 +++++++++++++++---------------- 1 file changed, 170 insertions(+), 179 deletions(-) mode change 100644 => 100755 test/compiler/cmake/BlastUnitTests.cmake (limited to 'test/compiler/cmake/BlastUnitTests.cmake') diff --git a/test/compiler/cmake/BlastUnitTests.cmake b/test/compiler/cmake/BlastUnitTests.cmake old mode 100644 new mode 100755 index 61e3241..82779e6 --- a/test/compiler/cmake/BlastUnitTests.cmake +++ b/test/compiler/cmake/BlastUnitTests.cmake @@ -1,179 +1,170 @@ -# -# Build BlastUnitTests Common -# - - -SET(TEST_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src) -SET(UNITTEST_SOURCE_DIR ${TEST_SOURCE_DIR}/unit) -SET(UTILS_SOURCE_DIR ${TEST_SOURCE_DIR}/utils) -SET(SHAREDUTILS_SOURCE_DIR ${BLAST_ROOT_DIR}/shared/utils) - -SET(COMMON_SOURCE_DIR ${BLAST_ROOT_DIR}/sdk/common) -SET(SOLVER_SOURCE_DIR ${BLAST_ROOT_DIR}/sdk/lowlevel/source) - - - -FIND_PACKAGE(PxSharedSDK $ENV{PM_PxSharedSDK_VERSION} REQUIRED) -FIND_PACKAGE(PhysXSDK $ENV{PM_PhysXSDK_VERSION} REQUIRED) -FIND_PACKAGE(GoogleTestNV $ENV{PM_googletest_VERSION} REQUIRED) - - -# Include here after the directories are defined so that the platform specific file can use the variables. -include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/BlastUnitTests.cmake) - -SET(UNITTEST_SOURCE_FILES - ${UNITTEST_SOURCE_DIR}/AssetTests.cpp - ${UNITTEST_SOURCE_DIR}/ActorTests.cpp - ${UNITTEST_SOURCE_DIR}/APITests.cpp - ${UNITTEST_SOURCE_DIR}/AuthoringCutout.cpp - ${UNITTEST_SOURCE_DIR}/CoreTests.cpp - ${UNITTEST_SOURCE_DIR}/FamilyGraphTests.cpp - ${UNITTEST_SOURCE_DIR}/MultithreadingTests.cpp - ${UNITTEST_SOURCE_DIR}/SyncTests.cpp - ${UNITTEST_SOURCE_DIR}/TkCompositeTests.cpp - ${UNITTEST_SOURCE_DIR}/TkTests.cpp -) - -SET(COMMON_SOURCE_FILES - ${BLASTUNITTESTS_PLATFORM_COMMON_FILES} - - ${TEST_SOURCE_DIR}/BlastBaseTest.h - ${TEST_SOURCE_DIR}/TkBaseTest.h -) - -SET(SDK_COMMON_FILES - ${COMMON_SOURCE_DIR}/NvBlastAssert.cpp - ${COMMON_SOURCE_DIR}/NvBlastAssert.h - ${COMMON_SOURCE_DIR}/NvBlastAtomic.cpp - ${COMMON_SOURCE_DIR}/NvBlastAtomic.h - ${COMMON_SOURCE_DIR}/NvBlastDLink.h - ${COMMON_SOURCE_DIR}/NvBlastFixedArray.h - ${COMMON_SOURCE_DIR}/NvBlastFixedBitmap.h - ${COMMON_SOURCE_DIR}/NvBlastFixedBoolArray.h - ${COMMON_SOURCE_DIR}/NvBlastFixedPriorityQueue.h - ${COMMON_SOURCE_DIR}/NvBlastGeometry.h - ${COMMON_SOURCE_DIR}/NvBlastIndexFns.h - ${COMMON_SOURCE_DIR}/NvBlastIteratorBase.h - ${COMMON_SOURCE_DIR}/NvBlastMath.h - ${COMMON_SOURCE_DIR}/NvBlastMemory.h - ${COMMON_SOURCE_DIR}/NvBlastPreprocessorInternal.h - ${COMMON_SOURCE_DIR}/NvBlastTime.cpp - ${COMMON_SOURCE_DIR}/NvBlastTime.h - ${COMMON_SOURCE_DIR}/NvBlastTimers.cpp -) - -SET(SDK_SOLVER_FILES - ${SOLVER_SOURCE_DIR}/NvBlastActor.cpp - ${SOLVER_SOURCE_DIR}/NvBlastActor.h - ${SOLVER_SOURCE_DIR}/NvBlastFamilyGraph.cpp - ${SOLVER_SOURCE_DIR}/NvBlastFamilyGraph.h - ${SOLVER_SOURCE_DIR}/NvBlastActorSerializationBlock.cpp - ${SOLVER_SOURCE_DIR}/NvBlastActorSerializationBlock.h - ${SOLVER_SOURCE_DIR}/NvBlastAsset.cpp - ${SOLVER_SOURCE_DIR}/NvBlastAsset.h - ${SOLVER_SOURCE_DIR}/NvBlastSupportGraph.h - ${SOLVER_SOURCE_DIR}/NvBlastChunkHierarchy.h - ${SOLVER_SOURCE_DIR}/NvBlastFamily.cpp - ${SOLVER_SOURCE_DIR}/NvBlastFamily.h -) - -SET(UTILS_SOURCE_FILES - ${SHAREDUTILS_SOURCE_DIR}/AssetGenerator.cpp - ${SHAREDUTILS_SOURCE_DIR}/AssetGenerator.h - - ${UTILS_SOURCE_DIR}/TaskDispatcher.h - ${UTILS_SOURCE_DIR}/TestAssets.cpp - ${UTILS_SOURCE_DIR}/TestAssets.h - ${UTILS_SOURCE_DIR}/TestProfiler.h -) - -SET(AUTHORING_SOURCE_FILES - ${BLAST_ROOT_DIR}/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.cpp -) - - -ADD_EXECUTABLE(BlastUnitTests - ${COMMON_SOURCE_FILES} - ${UTILS_SOURCE_FILES} - ${UNITTEST_SOURCE_FILES} - ${AUTHORING_SOURCE_FILES} - - ${SDK_COMMON_FILES} - ${SDK_SOLVER_FILES} -) - -set_target_properties(BlastUnitTests - PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} - CHECKED_POSTFIX ${CMAKE_CHECKED_POSTFIX} -# RELEASE_POSTFIX ${CMAKE_RELEASE_POSTFIX} - PROFILE_POSTFIX ${CMAKE_PROFILE_POSTFIX} -) - - -SOURCE_GROUP("Common" FILES ${COMMON_SOURCE_FILES}) -SOURCE_GROUP("Source" FILES ${UNITTEST_SOURCE_FILES}) -SOURCE_GROUP("Utils" FILES ${UTILS_SOURCE_FILES}) -SOURCE_GROUP("Sdk\\common" FILES ${SDK_COMMON_FILES}) -SOURCE_GROUP("Sdk\\solver" FILES ${SDK_SOLVER_FILES}) - - -# Target specific compile options - -TARGET_INCLUDE_DIRECTORIES(BlastUnitTests - PRIVATE ${BLASTUNITTESTS_PLATFORM_INCLUDES} - - PRIVATE ${TEST_SOURCE_DIR} - PRIVATE ${UTILS_SOURCE_DIR} - - PRIVATE ${BLAST_ROOT_DIR}/sdk/common - 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/assetutils/source - PRIVATE ${BLAST_ROOT_DIR}/sdk/extensions/assetutils/include - PRIVATE ${BLAST_ROOT_DIR}/sdk/extensions/authoring/source - PRIVATE ${BLAST_ROOT_DIR}/sdk/extensions/authoring/include - PRIVATE ${BLAST_ROOT_DIR}/sdk/extensions/serialization/include - PRIVATE ${BLAST_ROOT_DIR}/shared/utils - - PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS} - PRIVATE ${GOOGLETEST_INCLUDE_DIRS} - -) - -TARGET_COMPILE_DEFINITIONS(BlastUnitTests - PRIVATE ${BLASTUNITTESTS_COMPILE_DEFS} -) - -SET_TARGET_PROPERTIES(BlastUnitTests PROPERTIES - COMPILE_PDB_NAME_DEBUG "BlastUnitTests${CMAKE_DEBUG_POSTFIX}" - COMPILE_PDB_NAME_CHECKED "BlastUnitTests${CMAKE_CHECKED_POSTFIX}" - COMPILE_PDB_NAME_PROFILE "BlastUnitTests${CMAKE_PROFILE_POSTFIX}" - COMPILE_PDB_NAME_RELEASE "BlastUnitTests${CMAKE_RELEASE_POSTFIX}" -) - -TARGET_COMPILE_OPTIONS(BlastUnitTests - PRIVATE ${BLASTUNITTESTS_PLATFORM_COMPILE_OPTIONS} -) - -#TARGET_COMPILE_OPTIONS(BlastUnitTests PRIVATE /wd4005 /wd4244) - -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 NvBlastExtAssetUtils ${GOOGLETEST_LIBRARIES} - PRIVATE ${BLASTUNITTESTS_PLATFORM_LINKED_LIBS} - - PUBLIC $<$:${PXFOUNDATION_LIB_DEBUG}> $<$:${PXTASK_LIB_DEBUG}> - PUBLIC $<$:${PXFOUNDATION_LIB_CHECKED}> $<$:${PXTASK_LIB_CHECKED}> - PUBLIC $<$:${PXFOUNDATION_LIB_PROFILE}> $<$:${PXTASK_LIB_PROFILE}> - PUBLIC $<$:${PXFOUNDATION_LIB}> $<$:${PXTASK_LIB}> - -) - -# This is ugly, but have to include this after the target is defined -# This will be used for stuff like POST_BUILD commands that are platform specific -include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/BlastUnitTests-AT.cmake OPTIONAL) - +# +# Build BlastUnitTests Common +# + + +SET(TEST_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src) +SET(UNITTEST_SOURCE_DIR ${TEST_SOURCE_DIR}/unit) +SET(UTILS_SOURCE_DIR ${TEST_SOURCE_DIR}/utils) +SET(SHAREDUTILS_SOURCE_DIR ${BLAST_ROOT_DIR}/shared/utils) + +SET(COMMON_SOURCE_DIR ${BLAST_ROOT_DIR}/sdk/common) +SET(SOLVER_SOURCE_DIR ${BLAST_ROOT_DIR}/sdk/lowlevel/source) + + + +FIND_PACKAGE(PxSharedSDK $ENV{PM_PxSharedSDK_VERSION} REQUIRED) +FIND_PACKAGE(PhysXSDK $ENV{PM_PhysXSDK_VERSION} REQUIRED) +FIND_PACKAGE(GoogleTestNV $ENV{PM_googletest_VERSION} REQUIRED) + + +# Include here after the directories are defined so that the platform specific file can use the variables. +include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/BlastUnitTests.cmake) + +SET(UNITTEST_SOURCE_FILES + ${UNITTEST_SOURCE_DIR}/AssetTests.cpp + ${UNITTEST_SOURCE_DIR}/ActorTests.cpp + ${UNITTEST_SOURCE_DIR}/APITests.cpp + ${UNITTEST_SOURCE_DIR}/CoreTests.cpp + ${UNITTEST_SOURCE_DIR}/FamilyGraphTests.cpp + ${UNITTEST_SOURCE_DIR}/MultithreadingTests.cpp + ${UNITTEST_SOURCE_DIR}/SyncTests.cpp + ${UNITTEST_SOURCE_DIR}/TkCompositeTests.cpp + ${UNITTEST_SOURCE_DIR}/TkTests.cpp +) + +SET(COMMON_SOURCE_FILES + ${BLASTUNITTESTS_PLATFORM_COMMON_FILES} + + ${TEST_SOURCE_DIR}/BlastBaseTest.h + ${TEST_SOURCE_DIR}/TkBaseTest.h +) + +SET(SDK_COMMON_FILES + ${COMMON_SOURCE_DIR}/NvBlastAssert.cpp + ${COMMON_SOURCE_DIR}/NvBlastAssert.h + ${COMMON_SOURCE_DIR}/NvBlastAtomic.cpp + ${COMMON_SOURCE_DIR}/NvBlastAtomic.h + ${COMMON_SOURCE_DIR}/NvBlastDLink.h + ${COMMON_SOURCE_DIR}/NvBlastFixedArray.h + ${COMMON_SOURCE_DIR}/NvBlastFixedBitmap.h + ${COMMON_SOURCE_DIR}/NvBlastFixedBoolArray.h + ${COMMON_SOURCE_DIR}/NvBlastFixedPriorityQueue.h + ${COMMON_SOURCE_DIR}/NvBlastGeometry.h + ${COMMON_SOURCE_DIR}/NvBlastIndexFns.h + ${COMMON_SOURCE_DIR}/NvBlastIteratorBase.h + ${COMMON_SOURCE_DIR}/NvBlastMath.h + ${COMMON_SOURCE_DIR}/NvBlastMemory.h + ${COMMON_SOURCE_DIR}/NvBlastPreprocessorInternal.h + ${COMMON_SOURCE_DIR}/NvBlastTime.cpp + ${COMMON_SOURCE_DIR}/NvBlastTime.h + ${COMMON_SOURCE_DIR}/NvBlastTimers.cpp +) + +SET(SDK_SOLVER_FILES + ${SOLVER_SOURCE_DIR}/NvBlastActor.cpp + ${SOLVER_SOURCE_DIR}/NvBlastActor.h + ${SOLVER_SOURCE_DIR}/NvBlastFamilyGraph.cpp + ${SOLVER_SOURCE_DIR}/NvBlastFamilyGraph.h + ${SOLVER_SOURCE_DIR}/NvBlastActorSerializationBlock.cpp + ${SOLVER_SOURCE_DIR}/NvBlastActorSerializationBlock.h + ${SOLVER_SOURCE_DIR}/NvBlastAsset.cpp + ${SOLVER_SOURCE_DIR}/NvBlastAsset.h + ${SOLVER_SOURCE_DIR}/NvBlastSupportGraph.h + ${SOLVER_SOURCE_DIR}/NvBlastChunkHierarchy.h + ${SOLVER_SOURCE_DIR}/NvBlastFamily.cpp + ${SOLVER_SOURCE_DIR}/NvBlastFamily.h +) + +SET(UTILS_SOURCE_FILES + ${SHAREDUTILS_SOURCE_DIR}/AssetGenerator.cpp + ${SHAREDUTILS_SOURCE_DIR}/AssetGenerator.h + + ${UTILS_SOURCE_DIR}/TaskDispatcher.h + ${UTILS_SOURCE_DIR}/TestAssets.cpp + ${UTILS_SOURCE_DIR}/TestAssets.h + ${UTILS_SOURCE_DIR}/TestProfiler.h +) + +ADD_EXECUTABLE(BlastUnitTests + ${COMMON_SOURCE_FILES} + ${UTILS_SOURCE_FILES} + ${UNITTEST_SOURCE_FILES} + + ${SDK_COMMON_FILES} + ${SDK_SOLVER_FILES} +) + +set_target_properties(BlastUnitTests + PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} + CHECKED_POSTFIX ${CMAKE_CHECKED_POSTFIX} +# RELEASE_POSTFIX ${CMAKE_RELEASE_POSTFIX} + PROFILE_POSTFIX ${CMAKE_PROFILE_POSTFIX} +) + + +SOURCE_GROUP("Common" FILES ${COMMON_SOURCE_FILES}) +SOURCE_GROUP("Source" FILES ${UNITTEST_SOURCE_FILES}) +SOURCE_GROUP("Utils" FILES ${UTILS_SOURCE_FILES}) +SOURCE_GROUP("Sdk\\common" FILES ${SDK_COMMON_FILES}) +SOURCE_GROUP("Sdk\\solver" FILES ${SDK_SOLVER_FILES}) + + +# Target specific compile options + +TARGET_INCLUDE_DIRECTORIES(BlastUnitTests + PRIVATE ${BLASTUNITTESTS_PLATFORM_INCLUDES} + + PRIVATE ${TEST_SOURCE_DIR} + PRIVATE ${UTILS_SOURCE_DIR} + + PRIVATE ${BLAST_ROOT_DIR}/sdk/common + 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/assetutils/source + PRIVATE ${BLAST_ROOT_DIR}/sdk/extensions/assetutils/include + PRIVATE ${BLAST_ROOT_DIR}/sdk/extensions/serialization/include + PRIVATE ${BLAST_ROOT_DIR}/shared/utils + + PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS} + PRIVATE ${GOOGLETEST_INCLUDE_DIRS} + +) + +TARGET_COMPILE_DEFINITIONS(BlastUnitTests + PRIVATE ${BLASTUNITTESTS_COMPILE_DEFS} +) + +SET_TARGET_PROPERTIES(BlastUnitTests PROPERTIES + COMPILE_PDB_NAME_DEBUG "BlastUnitTests${CMAKE_DEBUG_POSTFIX}" + COMPILE_PDB_NAME_CHECKED "BlastUnitTests${CMAKE_CHECKED_POSTFIX}" + COMPILE_PDB_NAME_PROFILE "BlastUnitTests${CMAKE_PROFILE_POSTFIX}" + COMPILE_PDB_NAME_RELEASE "BlastUnitTests${CMAKE_RELEASE_POSTFIX}" +) + +TARGET_COMPILE_OPTIONS(BlastUnitTests + PRIVATE ${BLASTUNITTESTS_PLATFORM_COMPILE_OPTIONS} +) + +#TARGET_COMPILE_OPTIONS(BlastUnitTests PRIVATE /wd4005 /wd4244) + +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 NvBlastExtAssetUtils ${GOOGLETEST_LIBRARIES} + PRIVATE ${BLASTUNITTESTS_PLATFORM_LINKED_LIBS} + + PUBLIC $<$:${PXFOUNDATION_LIB_DEBUG}> $<$:${PXTASK_LIB_DEBUG}> + PUBLIC $<$:${PXFOUNDATION_LIB_CHECKED}> $<$:${PXTASK_LIB_CHECKED}> + PUBLIC $<$:${PXFOUNDATION_LIB_PROFILE}> $<$:${PXTASK_LIB_PROFILE}> + PUBLIC $<$:${PXFOUNDATION_LIB}> $<$:${PXTASK_LIB}> + +) + +# This is ugly, but have to include this after the target is defined +# This will be used for stuff like POST_BUILD commands that are platform specific +include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/BlastUnitTests-AT.cmake OPTIONAL) + -- cgit v1.2.3