Skip to content

Add ninja generator support #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add ninja generator support #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMake/NeighborhoodSearch.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ if(USE_GPU_NEIGHBORHOOD_SEARCH)
GIT_TAG "aba3da18cb4f45cd05d729465d1725891ffc33da"
INSTALL_DIR ${ExternalInstallDir}/NeighborhoodSearch
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${EXT_CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_INSTALL_PREFIX:PATH=${ExternalInstallDir}/NeighborhoodSearch -DCUNSEARCH_USE_DOUBLE_PRECISION:BOOL=${USE_DOUBLE_PRECISION} -DBUILD_DEMO:BOOL=OFF
BUILD_BYPRODUCTS ${ExternalInstallDir}/NeighborhoodSearch/lib/${LIB_PREFIX}cuNSearch${LIB_SUFFIX}
${ExternalInstallDir}/NeighborhoodSearch/lib/${LIB_PREFIX}cuNSearch_d${LIB_SUFFIX}
)

set(NEIGHBORHOOD_ASSEMBLY_NAME cuNSearch)
Expand All @@ -36,6 +38,8 @@ else(USE_GPU_NEIGHBORHOOD_SEARCH)
GIT_TAG "3f11ece16a419fc1cc5795d6aa87cb7fe6b86960"
INSTALL_DIR ${ExternalInstallDir}/NeighborhoodSearch
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${EXT_CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_INSTALL_PREFIX:PATH=${ExternalInstallDir}/NeighborhoodSearch -DUSE_DOUBLE_PRECISION:BOOL=${USE_DOUBLE_PRECISION} -DBUILD_DEMO:BOOL=OFF
BUILD_BYPRODUCTS ${ExternalInstallDir}/NeighborhoodSearch/lib/${LIB_PREFIX}CompactNSearch${LIB_SUFFIX}
${ExternalInstallDir}/NeighborhoodSearch/lib/${LIB_PREFIX}CompactNSearch_d${LIB_SUFFIX}
)
set(NEIGHBORHOOD_ASSEMBLY_NAME CompactNSearch)

Expand Down
9 changes: 9 additions & 0 deletions CMake/SetUpExternalProjects.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ ExternalProject_Add(
GIT_TAG "0b69062ff9c56fbb6dcecd296652028bedbacf0e"
INSTALL_DIR ${ExternalInstallDir}/Discregrid
CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${EXT_CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${ExternalInstallDir}/Discregrid -DBUILD_CMD_EXECUTABLE:BOOL=0 -DEIGEN3_INCLUDE_DIR:PATH=${EIGEN3_INCLUDE_DIR} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
BUILD_BYPRODUCTS ${ExternalInstallDir}/Discregrid/lib/${LIB_PREFIX}Discregrid${LIB_SUFFIX}
${ExternalInstallDir}/Discregrid/lib/${LIB_PREFIX}Discregrid_d${LIB_SUFFIX}
)
ExternalProject_Get_Property(Ext_Discregrid INSTALL_DIR)
set(DISCREGRID_INCLUDE_DIR ${INSTALL_DIR}/include)
Expand All @@ -36,6 +38,7 @@ ExternalProject_Add(
GIT_TAG "42d52ad551fafba600ee99e59fb0f9c7b557e2ed"
INSTALL_DIR ${ExternalInstallDir}/GenericParameters
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${EXT_CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${ExternalInstallDir}/GenericParameters -DGENERICPARAMETERS_NO_TESTS:BOOL=1 -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
BUILD_BYPRODUCTS ${ExternalInstallDir}/GenericParameters/include
)
ExternalProject_Get_Property(Ext_GenericParameters INSTALL_DIR)
set(GENERICPARAMETERS_INCLUDE_DIR ${INSTALL_DIR}/include)
Expand All @@ -60,6 +63,12 @@ ExternalProject_Add(
-DDiscregrid_DEBUG_LIB:FILEPATH=${DISCREGRID_DEBUG_LIB}
-DDiscregrid_LIB:FILEPATH=${DISCREGRID_LIB}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
BUILD_BYPRODUCTS ${ExternalInstallDir}/PositionBasedDynamics/lib/${LIB_PREFIX}Simulation${LIB_SUFFIX}
${ExternalInstallDir}/PositionBasedDynamics/lib/${LIB_PREFIX}PositionBasedDynamics${LIB_SUFFIX}
${ExternalInstallDir}/PositionBasedDynamics/lib/${LIB_PREFIX}Utils${LIB_SUFFIX}
${ExternalInstallDir}/PositionBasedDynamics/lib/${LIB_PREFIX}Simulation_d${LIB_SUFFIX}
${ExternalInstallDir}/PositionBasedDynamics/lib/${LIB_PREFIX}PositionBasedDynamics_d${LIB_SUFFIX}
${ExternalInstallDir}/PositionBasedDynamics/lib/${LIB_PREFIX}Utils_d${LIB_SUFFIX}
)
ExternalProject_Get_Property(Ext_PBD INSTALL_DIR)
set(PBD_INCLUDE_DIR ${INSTALL_DIR}/include)
Expand Down