diff options
| author | sabdulajees <[email protected]> | 2017-02-15 22:28:24 -0600 |
|---|---|---|
| committer | sabdulajees <[email protected]> | 2017-02-15 22:28:24 -0600 |
| commit | bcb9fac9a618b36e29757996b7df93404075dfd3 (patch) | |
| tree | 42f54f9e45e4ac8bb9cad2b1221197b499d4e0ca /compiler/cmake | |
| parent | Removing commented out script code (diff) | |
| download | waveworks_archive-NRD_like_API.tar.xz waveworks_archive-NRD_like_API.zip | |
Remove CUDA Toolkit dependencyHEADmasterNRD_like_API
Diffstat (limited to 'compiler/cmake')
| -rw-r--r-- | compiler/cmake/NvWaveWorks.cmake | 20 | ||||
| -rw-r--r-- | compiler/cmake/ServerApp.cmake | 2 | ||||
| -rw-r--r-- | compiler/cmake/sample_d3d11.cmake | 2 | ||||
| -rw-r--r-- | compiler/cmake/test_d3d11.cmake | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/compiler/cmake/NvWaveWorks.cmake b/compiler/cmake/NvWaveWorks.cmake index 79982df..e4a1cd6 100644 --- a/compiler/cmake/NvWaveWorks.cmake +++ b/compiler/cmake/NvWaveWorks.cmake @@ -2,7 +2,7 @@ # Build NvWaveWorks (PROJECT not SOLUTION) # -FIND_PACKAGE(CUDA REQUIRED) +# FIND_PACKAGE(CUDA REQUIRED) FIND_PACKAGE(FXC REQUIRED) @@ -77,10 +77,10 @@ SET(CPP_FILES ${WW_SOURCE_DIR}/Entrypoints.cpp ${WW_SOURCE_DIR}/FFT_Simulation_CPU.cpp - ${WW_SOURCE_DIR}/FFT_Simulation_CUDA.cpp + # ${WW_SOURCE_DIR}/FFT_Simulation_CUDA.cpp ${WW_SOURCE_DIR}/FFT_Simulation_DirectCompute.cpp ${WW_SOURCE_DIR}/FFT_Simulation_Manager_CPU.cpp - ${WW_SOURCE_DIR}/FFT_Simulation_Manager_CUDA.cpp + # ${WW_SOURCE_DIR}/FFT_Simulation_Manager_CUDA.cpp ${WW_SOURCE_DIR}/FFT_Simulation_Manager_DirectCompute.cpp ${WW_SOURCE_DIR}/GFX_Timer.cpp @@ -98,11 +98,11 @@ SET(H_FILES ${WW_SOURCE_DIR}/FFT_API_Support.h ${WW_SOURCE_DIR}/FFT_Simulation.h ${WW_SOURCE_DIR}/FFT_Simulation_CPU_impl.h - ${WW_SOURCE_DIR}/FFT_Simulation_CUDA_impl.h + # ${WW_SOURCE_DIR}/FFT_Simulation_CUDA_impl.h ${WW_SOURCE_DIR}/FFT_Simulation_DirectCompute_impl.h ${WW_SOURCE_DIR}/FFT_Simulation_Manager.h ${WW_SOURCE_DIR}/FFT_Simulation_Manager_CPU_impl.h - ${WW_SOURCE_DIR}/FFT_Simulation_Manager_CUDA_impl.h + # ${WW_SOURCE_DIR}/FFT_Simulation_Manager_CUDA_impl.h ${WW_SOURCE_DIR}/FFT_Simulation_Manager_DirectCompute_impl.h ${WW_SOURCE_DIR}/Float16_Util.h ${WW_SOURCE_DIR}/GFX_Timer_impl.h @@ -136,9 +136,9 @@ SET(HLSL_FILES ${WW_SOURCE_DIR}/FFT_Simulation_DirectCompute_shader.hlsl ) -SET(CUDA_FILES - ${WW_SOURCE_DIR}/FFT_Simulation_CUDA_kernel.cu -) +# SET(CUDA_FILES + # ${WW_SOURCE_DIR}/FFT_Simulation_CUDA_kernel.cu +# ) SET(FX_FILES ${SHADER_SRC_DIR}/CalcGradient.fx @@ -257,7 +257,7 @@ SOURCE_GROUP("fx" FILES ${FX_FILES}) TARGET_INCLUDE_DIRECTORIES(WaveWorks PRIVATE ${WW_PLATFORM_INCLUDES} - PRIVATE ${CUDA_INCLUDE_DIRS} + # PRIVATE ${CUDA_INCLUDE_DIRS} PRIVATE ${GEN_SRC_DIR} PRIVATE ${COMMON_SOURCE_DIR} @@ -277,7 +277,7 @@ TARGET_COMPILE_DEFINITIONS(WaveWorks IF(TARGET_BUILD_PLATFORM STREQUAL "Windows") # Add linked libraries - TARGET_LINK_LIBRARIES(WaveWorks PUBLIC ${CUDA_LIBRARIES} dxguid.lib ) + TARGET_LINK_LIBRARIES(WaveWorks PUBLIC dxguid.lib ) IF(CMAKE_CL_64) SET(LIBPATH_SUFFIX "win64") diff --git a/compiler/cmake/ServerApp.cmake b/compiler/cmake/ServerApp.cmake index 866fd0d..c88db77 100644 --- a/compiler/cmake/ServerApp.cmake +++ b/compiler/cmake/ServerApp.cmake @@ -115,7 +115,7 @@ TARGET_COMPILE_DEFINITIONS(ServerApp IF(TARGET_BUILD_PLATFORM STREQUAL "Windows") # Add linked libraries - TARGET_LINK_LIBRARIES(ServerApp PUBLIC WaveWorks Ws2_32.lib comctl32.lib ${CUDA_LIBRARIES}) + TARGET_LINK_LIBRARIES(ServerApp PUBLIC WaveWorks Ws2_32.lib comctl32.lib) IF(CMAKE_CL_64) SET(LIBPATH_SUFFIX "win64") diff --git a/compiler/cmake/sample_d3d11.cmake b/compiler/cmake/sample_d3d11.cmake index b9ebb9d..22ef0ea 100644 --- a/compiler/cmake/sample_d3d11.cmake +++ b/compiler/cmake/sample_d3d11.cmake @@ -149,7 +149,7 @@ TARGET_COMPILE_DEFINITIONS(SampleD3D11 IF(TARGET_BUILD_PLATFORM STREQUAL "Windows") # Add linked libraries - TARGET_LINK_LIBRARIES(SampleD3D11 PUBLIC WaveWorks Ws2_32.lib comctl32.lib Usp10.lib ${CUDA_LIBRARIES} dxguid.lib d3d11.lib ${DXUT_LIBRARIES} ${FX11_LIBRARIES} ${DXTK_LIBRARIES}) + TARGET_LINK_LIBRARIES(SampleD3D11 PUBLIC WaveWorks Ws2_32.lib comctl32.lib Usp10.lib dxguid.lib d3d11.lib ${DXUT_LIBRARIES} ${FX11_LIBRARIES} ${DXTK_LIBRARIES}) IF(CMAKE_CL_64) SET(LIBPATH_SUFFIX "win64") diff --git a/compiler/cmake/test_d3d11.cmake b/compiler/cmake/test_d3d11.cmake index 78f2470..5ca904d 100644 --- a/compiler/cmake/test_d3d11.cmake +++ b/compiler/cmake/test_d3d11.cmake @@ -159,7 +159,7 @@ TARGET_COMPILE_DEFINITIONS(TestD3D11 IF(TARGET_BUILD_PLATFORM STREQUAL "Windows") # Add linked libraries - TARGET_LINK_LIBRARIES(TestD3D11 PUBLIC WaveWorks Ws2_32.lib comctl32.lib Usp10.lib ${CUDA_LIBRARIES} dxguid.lib d3d11.lib ${DXUT_LIBRARIES} ${FX11_LIBRARIES} ${DXTK_LIBRARIES}) + TARGET_LINK_LIBRARIES(TestD3D11 PUBLIC WaveWorks Ws2_32.lib comctl32.lib Usp10.lib dxguid.lib d3d11.lib ${DXUT_LIBRARIES} ${FX11_LIBRARIES} ${DXTK_LIBRARIES}) IF(CMAKE_CL_64) SET(LIBPATH_SUFFIX "win64") |