diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1ce15b09cd0096a7078c2f8c517aa4ec92a3c5b2..662172e92a38e4d8db1b9eb0321cc24c540f9a9d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,10 +4,10 @@ cmake_minimum_required(VERSION 3.9 FATAL_ERROR) set(USE_CUDA ON) if(USE_CUDA) -# set the project name and version -project(arbd VERSION 1.2 LANGUAGES CXX CUDA) + # set the project name and version + project(arbd VERSION 1.2 LANGUAGES CXX CUDA) else(USE_CUDA) -project(arbd VERSION 1.2 LANGUAGES CXX) + project(arbd VERSION 1.2 LANGUAGES CXX) endif() # specify the C++ standard @@ -21,13 +21,13 @@ option(USE_NCCL "Use NCCL for single node GPU peer communication" ON) # configure_file(TutorialConfig.h.in TutorialConfig.h) message(STATUS "USE_CUDA: ${USE_CUDA}") if(USE_CUDA) - add_definitions(-DUSE_CUDA) - ## CUDA_INCLUDE_DIRS wasn't getting set on my system with cmake 3.14.1, so check if in env - if(DEFINED ENV{CUDA_INCLUDE_DIRS}) + add_definitions(-DUSE_CUDA) + ## CUDA_INCLUDE_DIRS wasn't getting set on my system with cmake 3.14.1, so check if in env + if(DEFINED ENV{CUDA_INCLUDE_DIRS}) set(CUDA_INCLUDE_DIRS $ENV{CUDA_INCLUDE_DIRS}) - endif() - message(STATUS "CUDA_INC: ${CUDA_INCLUDE_DIRS}") - include_directories(${CUDA_INCLUDE_DIRS}) + endif() + message(STATUS "CUDA_INC: ${CUDA_INCLUDE_DIRS}") + include_directories(${CUDA_INCLUDE_DIRS}) endif() ## Two lines below needed? @@ -46,42 +46,42 @@ set(CMAKE_MACOSX_RPATH 1) # Unsure if this works for CMAKE_BUIlD_RPATH, or just set(CMAKE_BUILD_RPATH "${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES}") add_executable(arbd arbd.cpp -Configuration.cpp -FlowForce.cpp -GPUManager.cpp -Scatter.cpp -SignalManager.cpp -WKFUtils.cpp -Angle.cu -BaseGrid.cu -BrownianParticle.cu -BrownianParticleType.cpp -RigidBodyController.cu -RigidBody.cu -RigidBodyGrid.cu -RigidBodyType.cu -CellDecomposition.cu -ComputeForce.cuh -ComputeForce.cu -ComputeGridGrid.cuh -ComputeGridGrid.cu -CudaUtil.cu -CudaUtil.cuh -Dihedral.cu -Exclude.cu -GrandBrownTown.cu -GrandBrownTown.cuh -imd.cpp -vmdsock.cpp -JamesBond.cu -RandomCUDA.cu -Reservoir.cu -TabulatedAngle.cu -TabulatedDihedral.cu -TabulatedMethods.cuh -TabulatedPotential.cu -useful.cu -) + Configuration.cpp + FlowForce.cpp + GPUManager.cpp + Scatter.cpp + SignalManager.cpp + WKFUtils.cpp + Angle.cu + BaseGrid.cu + BrownianParticle.cu + BrownianParticleType.cpp + RigidBodyController.cu + RigidBody.cu + RigidBodyGrid.cu + RigidBodyType.cu + CellDecomposition.cu + ComputeForce.cuh + ComputeForce.cu + ComputeGridGrid.cuh + ComputeGridGrid.cu + CudaUtil.cu + CudaUtil.cuh + Dihedral.cu + Exclude.cu + GrandBrownTown.cu + GrandBrownTown.cuh + imd.cpp + vmdsock.cpp + JamesBond.cu + RandomCUDA.cu + Reservoir.cu + TabulatedAngle.cu + TabulatedDihedral.cu + TabulatedMethods.cuh + TabulatedPotential.cu + useful.cu + ) target_link_libraries(arbd PRIVATE curand)