diff options
Diffstat (limited to 'NvCloth/Tools/AuthoringLibrary')
6 files changed, 15 insertions, 55 deletions
diff --git a/NvCloth/Tools/AuthoringLibrary/CMakeLists.txt b/NvCloth/Tools/AuthoringLibrary/CMakeLists.txt index e9702e3..dcb583a 100644 --- a/NvCloth/Tools/AuthoringLibrary/CMakeLists.txt +++ b/NvCloth/Tools/AuthoringLibrary/CMakeLists.txt @@ -4,6 +4,14 @@ project(NvClothAuthoringLibrary CXX) CMAKE_POLICY(SET CMP0057 NEW) # Enable IN_LIST +SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT}) + +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) + + +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; "${CMAKE_CURRENT_SOURCE_DIR}/../..") +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; "${CMAKE_CURRENT_SOURCE_DIR}/external/CMakeModules") + IF(NOT DEFINED AUTHORINGLIBRARY_ROOT_DIR) STRING(REPLACE "\\" "/" BRD_TEMP $ENV{AUTHORINGLIBRARY_ROOT_DIR}) @@ -17,8 +25,6 @@ IF(NOT EXISTS ${AUTHORINGLIBRARY_ROOT_DIR}) MESSAGE(FATAL_ERROR "AUTHORINGLIBRARY_ROOT_DIR environment variable wasn't set or was invalid.") ENDIF() -SET(GW_DEPS_ROOT "${AUTHORINGLIBRARY_ROOT_DIR}/external") - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${GW_DEPS_ROOT}/CMakeModules") MESSAGE("AUTHORINGLIBRARY_ROOT_DIR:" ${AUTHORINGLIBRARY_ROOT_DIR}) diff --git a/NvCloth/Tools/AuthoringLibrary/CmakeGenerateProjects.bat b/NvCloth/Tools/AuthoringLibrary/CmakeGenerateProjects.bat index e3a297c..7b51db9 100644 --- a/NvCloth/Tools/AuthoringLibrary/CmakeGenerateProjects.bat +++ b/NvCloth/Tools/AuthoringLibrary/CmakeGenerateProjects.bat @@ -1,8 +1,10 @@ CD /D %~dp0 +set GW_DEPS_ROOT=%~dp0..\..\..\ echo "Note: You need to run this with admin rights for the first time to set GW_DEPS_ROOT globally." -call "../../scripts/locate_gw_root.bat" GW_DEPS_ROOT_F -@echo on -setx GW_DEPS_ROOT "%GW_DEPS_ROOT_F% +REM single " is not a mistake +setx GW_DEPS_ROOT "%GW_DEPS_ROOT% +REM this one is for local use +set GW_DEPS_ROOT=%GW_DEPS_ROOT% echo GW_DEPS_ROOT = %GW_DEPS_ROOT% REM Install cmake using packman @@ -27,11 +29,4 @@ pushd compiler\vc14win64-cmake\ popd -rmdir /s /q compiler\vc14win32-cmake\ -mkdir compiler\vc14win32-cmake\ -pushd compiler\vc14win32-cmake\ -%CMAKE% ..\.. -G "Visual Studio 14 2015" -AWin32 -DTARGET_BUILD_PLATFORM=windows -DSTATIC_WINCRT=0 -DBL_DLL_OUTPUT_DIR=%OUTPUT_ROOT%\bin\vc14win32-cmake -DBL_LIB_OUTPUT_DIR=%OUTPUT_ROOT%\lib\vc14win32-cmake -DBL_EXE_OUTPUT_DIR=%OUTPUT_ROOT%\bin\vc14win32-cmake - -popd - pause diff --git a/NvCloth/Tools/AuthoringLibrary/compiler/cmake/AuthoringLibrary.cmake b/NvCloth/Tools/AuthoringLibrary/compiler/cmake/AuthoringLibrary.cmake index e649116..6caab92 100644 --- a/NvCloth/Tools/AuthoringLibrary/compiler/cmake/AuthoringLibrary.cmake +++ b/NvCloth/Tools/AuthoringLibrary/compiler/cmake/AuthoringLibrary.cmake @@ -65,7 +65,6 @@ SET_TARGET_PROPERTIES(NvClothAuthoringLibrary PROPERTIES TARGET_COMPILE_OPTIONS(NvClothAuthoringLibrary PRIVATE /wd4005 /wd4244) -TARGET_LINK_LIBRARIES(NvClothAuthoringLibrary PUBLIC PxFoundation) TARGET_LINK_LIBRARIES(NvClothAuthoringLibrary PUBLIC NvCloth) SET_TARGET_PROPERTIES(NvClothAuthoringLibrary PROPERTIES LINK_FLAGS ${AUTHORINGLIBRARY_LINK_FLAGS}) diff --git a/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/AuthoringLibrary.cmake b/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/AuthoringLibrary.cmake index 88a3dd5..5b4c180 100644 --- a/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/AuthoringLibrary.cmake +++ b/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/AuthoringLibrary.cmake @@ -29,7 +29,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) +# 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) @@ -39,6 +39,6 @@ else() SET(D3DCOMPILER_DLL "\"$(VC_ExecutablePath_x86_x86)/d3dcompiler_47.dll\"") - SET(ASSIMP_DLLS ${ASSIMP_DLL_PATH}/Release/assimp-vc140-mt.dll) +# SET(ASSIMP_DLLS ${ASSIMP_DLL_PATH}/Release/assimp-vc140-mt.dll) endif() diff --git a/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/CMakeLists.txt b/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/CMakeLists.txt index fd9d4bd..7670847 100644 --- a/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/CMakeLists.txt +++ b/NvCloth/Tools/AuthoringLibrary/compiler/cmake/windows/CMakeLists.txt @@ -1,20 +1,5 @@ #Platform specific compile flags and project includes -SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT}) - -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/sw/physx/tools/CMakeModules) - -IF(EXISTS $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) -ENDIF() - - -IF(EXISTS $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}; $ENV{GW_DEPS_ROOT}/Externals/CMakeModules) -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}) #NOTE: Warnings lowered on the sample projects as it's got a lot of warnings. Defines below hide more. @@ -67,11 +52,6 @@ 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") diff --git a/NvCloth/Tools/AuthoringLibrary/external/CMakeModules/FindPxShared.cmake b/NvCloth/Tools/AuthoringLibrary/external/CMakeModules/FindPxShared.cmake deleted file mode 100644 index c094676..0000000 --- a/NvCloth/Tools/AuthoringLibrary/external/CMakeModules/FindPxShared.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# - Try to find PxShared -# Once done this will define -# PXSHARED_FOUND - System has PxShared -# PXSHARED_ROOT_DIR - The root of PxShared - -# NOTE: We're including a version in this, but the first hint is without one - we should use that! -FIND_PATH( PXSHARED_ROOT_DIR include/cudamanager/PxGpuCopyDesc.h - HINTS - ${GW_DEPS_ROOT}/PxShared/${PxShared_FIND_VERSION} - ${GW_DEPS_ROOT}/sw/physx/PxShared/1.0/trunk - - ) - - - - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PxShared DEFAULT_MSG PXSHARED_ROOT_DIR) - -mark_as_advanced(PXSHARED_ROOT_DIR) |