diff options
Diffstat (limited to 'NvCloth/samples/compiler')
4 files changed, 33 insertions, 23 deletions
diff --git a/NvCloth/samples/compiler/cmake/SampleBase.cmake b/NvCloth/samples/compiler/cmake/SampleBase.cmake index b552bb7..a1fdb67 100644 --- a/NvCloth/samples/compiler/cmake/SampleBase.cmake +++ b/NvCloth/samples/compiler/cmake/SampleBase.cmake @@ -5,6 +5,9 @@ MESSAGE("SampleBase.cmake [begin]") MESSAGE("CMAKE_MODULE_PATH: " ${CMAKE_MODULE_PATH}) +SET(NVCLOTH_ROOT_DIR ${GW_DEPS_ROOT}/NvCloth) + +MESSAGE("NVCLOTH_ROOT_DIR: " ${NVCLOTH_ROOT_DIR}) SET(SB_SOURCE_DIR ${PROJECT_SOURCE_DIR}/SampleBase) SET(SB_CORE_SOURCE_DIR ${SB_SOURCE_DIR}/core) @@ -14,7 +17,6 @@ SET(SB_UI_SOURCE_DIR ${SB_SOURCE_DIR}/ui) SET(SB_UTILS_SOURCE_DIR ${SB_SOURCE_DIR}/utils) SET(SB_TASK_SOURCE_DIR ${SB_SOURCE_DIR}/task) -FIND_PACKAGE(PxShared "1.0.21467209.1" REQUIRED) FIND_PACKAGE(DXUT "9.15.2016.1" REQUIRED) FIND_PACKAGE(DirectXTex "10.5.2016.2" REQUIRED) FIND_PACKAGE(imgui "1.49" REQUIRED) @@ -152,7 +154,8 @@ SET(UTIL_FILES ${SB_UTILS_SOURCE_DIR}/MeshGenerator.h ${SB_UTILS_SOURCE_DIR}/DataStream.cpp ${SB_UTILS_SOURCE_DIR}/DataStream.h - + ${SB_UTILS_SOURCE_DIR}/AnimatedModelUtilities.cpp + ${SB_UTILS_SOURCE_DIR}/AnimatedModelUtilities.h ) SET(TASK_FILES @@ -243,11 +246,10 @@ TARGET_LINK_LIBRARIES(SampleBase PUBLIC d3dcompiler.lib d3d11.lib dxgi.lib comctl32.lib PUBLIC ${HBAO_LIB} ${SHADOW_LIB} ${DXUT_LIBRARIES} ${DIRECTXTEX_LIBRARIES} ${ASSIMP_LIBRARIES}) -TARGET_LINK_LIBRARIES(SampleBase PUBLIC PxFoundation) TARGET_LINK_LIBRARIES(SampleBase PUBLIC NvCloth) TARGET_LINK_LIBRARIES(SampleBase PUBLIC ${CUDA_CUDA_LIBRARY}) SET_TARGET_PROPERTIES(SampleBase PROPERTIES LINK_FLAGS ${SAMPLEBASE_LINK_FLAGS}) include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/SampleBase-AT.cmake OPTIONAL) -MESSAGE("SampleBase.cmake [end]")
\ No newline at end of file +MESSAGE("SampleBase.cmake [end]") diff --git a/NvCloth/samples/compiler/cmake/windows/CMakeLists.txt b/NvCloth/samples/compiler/cmake/windows/CMakeLists.txt index a7dc6b2..906fe15 100644 --- a/NvCloth/samples/compiler/cmake/windows/CMakeLists.txt +++ b/NvCloth/samples/compiler/cmake/windows/CMakeLists.txt @@ -3,17 +3,26 @@ MESSAGE("Windows/CMakeLists.txt [begin]") SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT}) +SET(CMAKE_MODULE_PATH $ENV{GW_DEPS_ROOT}NvCloth/Externals/CMakeModules) - -IF(EXISTS $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) -ELSE() - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/sw/physx/tools/CMakeModules) +# Add find modules to the path +IF(NOT EXISTS ${CMAKE_MODULE_PATH}) + MESSAGE(FATAL_ERROR "Could not find CMakeModules at ${CMAKE_MODULE_PATH}") ENDIF() -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; "${CMAKE_CURRENT_SOURCE_DIR}/..") SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; "${CMAKE_CURRENT_SOURCE_DIR}/external/CMakeModules") -MESSAGE("CMAKE_MODULE_PATH: " ${CMAKE_MODULE_PATH}) + +IF(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external/CMakeModules") + MESSAGE(FATAL_ERROR "Could not find CMakeModules at ${CMAKE_CURRENT_SOURCE_DIR}/external/CMakeModules") +ENDIF() + +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; "$ENV{GW_DEPS_ROOT}/NvCloth") + +IF(NOT EXISTS "$ENV{GW_DEPS_ROOT}/NvCloth") + MESSAGE(FATAL_ERROR "Could not find CMakeModules for FindNvCloth.cmake at $ENV{GW_DEPS_ROOT}/NvCloth") +ENDIF() + +MESSAGE( "[samples]windows/CMakeLists.txt CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}") #NOTE: Warnings lowered on the sample projects as it's got a lot of warnings. Defines below hide more. SET(CMAKE_CXX_FLAGS "/GR- /GF /MP /Gy /EHsc /d2Zi+ /errorReport:prompt /fp:fast /Gd /Gm- /GS- /nologo /W3 /WX /Zc:forScope /Zc:inline /Zc:wchar_t /Zi") @@ -59,21 +68,13 @@ SET(CMAKE_PROFILE_POSTFIX "${CMAKE_PROFILE_POSTFIX}_${LIBPATH_SUFFIX}") SET(CMAKE_CHECKED_POSTFIX "${CMAKE_CHECKED_POSTFIX}_${LIBPATH_SUFFIX}") SET(CMAKE_RELEASE_POSTFIX "${CMAKE_RELEASE_POSTFIX}_${LIBPATH_SUFFIX}") -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; "${CMAKE_CURRENT_SOURCE_DIR}/../../../..") +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; "${CMAKE_CURRENT_SOURCE_DIR}/../../../../..") SET(PX_SELECT_COMPONENTS PxFoundation) FIND_PACKAGE(PxShared REQUIRED) FIND_PACKAGE(NvCloth REQUIRED) - -# Include the PxShared-exports.cmake file that PxShared created. There's other ways to do this, but there's a bunch of issues with it in a CI environment -# such as - we don't want to be installing any built artifacts on this server, etc. So for now we hack it. - -# Add PxShared as a dependency so that we can use project references -#ADD_SUBDIRECTORY(${PXSHARED_ROOT_DIR}/src/compiler/cmake/windows "${CMAKE_CURRENT_BINARY_DIR}/pxshared_bin") -#MESSAGE("NVCLOTH_ROOT_DIR = ${NVCLOTH_ROOT_DIR}") ADD_SUBDIRECTORY(${NVCLOTH_ROOT_DIR}/compiler/cmake/windows "${CMAKE_CURRENT_BINARY_DIR}/NvCloth_bin") - # Include all of the projects INCLUDE(${PROJECT_CMAKE_FILES_DIR}/SampleBase.cmake) diff --git a/NvCloth/samples/compiler/cmake/windows/SampleBase-AT.cmake b/NvCloth/samples/compiler/cmake/windows/SampleBase-AT.cmake index 0673b96..e445e2a 100644 --- a/NvCloth/samples/compiler/cmake/windows/SampleBase-AT.cmake +++ b/NvCloth/samples/compiler/cmake/windows/SampleBase-AT.cmake @@ -16,5 +16,10 @@ ADD_CUSTOM_COMMAND(TARGET SampleBase POST_BUILD ${D3DCOMPILER_DLL} ${BL_EXE_OUTPUT_DIR} ) +#ADD_CUSTOM_COMMAND(TARGET SampleBase POST_BUILD +# COMMAND ${CMAKE_COMMAND} -E copy_if_different +# ${ASSIMP_DLLS} +# ${BL_EXE_OUTPUT_DIR} +#) -MESSAGE("Windows/SampleBase.cmake [end]")
\ No newline at end of file +MESSAGE("Windows/SampleBase.cmake [end]") diff --git a/NvCloth/samples/compiler/cmake/windows/SampleBase.cmake b/NvCloth/samples/compiler/cmake/windows/SampleBase.cmake index 46b865a..d98f49e 100644 --- a/NvCloth/samples/compiler/cmake/windows/SampleBase.cmake +++ b/NvCloth/samples/compiler/cmake/windows/SampleBase.cmake @@ -3,7 +3,7 @@ # MESSAGE("Windows/SampleBase.cmake [begin]") -FIND_PACKAGE(CUDA 8 REQUIRED) +FIND_PACKAGE(CUDA 10 REQUIRED) SET(SAMPLEBASE_PLATFORM_COMMON_FILES ) @@ -35,6 +35,7 @@ if (CMAKE_CL_64) SET(D3DCOMPILER_DLL "\"$(VC_ExecutablePath_x64_x64)/d3dcompiler_47.dll\"") +# SET(ASSIMP_DLLS ${ASSIMP_DLL_PATH}/Release/assimp-vc140-mt.dll) else() SET(SHADOW_LIB ${NVCLOTH_ROOT_DIR}/samples/external/shadow_lib/GFSDK_ShadowLib_DX11.win32.lib) SET(SHADOW_DLLS ${NVCLOTH_ROOT_DIR}/samples/external/shadow_lib/GFSDK_ShadowLib_DX11.win32.dll) @@ -44,7 +45,8 @@ else() SET(D3DCOMPILER_DLL "\"$(VC_ExecutablePath_x86_x86)/d3dcompiler_47.dll\"") +# SET(ASSIMP_DLLS ${ASSIMP_DLL_PATH}/Release/assimp-vc140-mt.dll) endif() -MESSAGE("Windows/SampleBase.cmake [end]")
\ No newline at end of file +MESSAGE("Windows/SampleBase.cmake [end]") |