Skip to content

Fix cmake install #30

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
g0mb4 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix cmake install #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8003c45
cmake: Add sane defaults for models.
g0mb4 Apr 22, 2023
f6e574e
cmake: Fix `make install` target.
g0mb4 Apr 22, 2023
94a1ace
Add .gitignore for "build/".
g0mb4 Apr 22, 2023
e72f102
Merge branch 'CFDEMproject:master' into fix-cmake-install
g0mb4 Jul 11, 2023
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
build/

10 changes: 5 additions & 5 deletions doc/Section_start.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,9 +724,9 @@ The following cmake flags can be used (the default values are shown as well):
- ENABLE_JPEG:BOOL=OFF
- ENABLE_LONGLONG_TO_LONG:BOOL=OFF
- ENABLE_MODEL_COHESION_EASO_CAPILLARY_VISCOUS:BOOL=OFF
- ENABLE_MODEL_COHESION_OFF:BOOL=OFF
- ENABLE_MODEL_COHESION_SJKR:BOOL=ON
- ENABLE_MODEL_COHESION_SJKR2:BOOL=ON
- ENABLE_MODEL_COHESION_OFF:BOOL=ON
- ENABLE_MODEL_COHESION_SJKR:BOOL=OFF
- ENABLE_MODEL_COHESION_SJKR2:BOOL=OFF
- ENABLE_MODEL_COHESION_WASHINO_CAPILLARY_VISCOUS:BOOL=OFF
- ENABLE_MODEL_EDINBURGH:BOOL=OFF
- ENABLE_MODEL_EDINBURGH_STIFFNESS:BOOL=OFF
Expand All @@ -736,9 +736,9 @@ The following cmake flags can be used (the default values are shown as well):
- ENABLE_MODEL_HOOKE_HYSTERESIS:BOOL=OFF
- ENABLE_MODEL_HOOKE_STIFFNESS:BOOL=OFF
- ENABLE_MODEL_LUDING:BOOL=OFF
- ENABLE_MODEL_ROLLING_CDT:BOOL=OFF
- ENABLE_MODEL_ROLLING_CDT:BOOL=ON
- ENABLE_MODEL_ROLLING_EPSD:BOOL=OFF
- ENABLE_MODEL_ROLLING_EPSD2:BOOL=ON
- ENABLE_MODEL_ROLLING_EPSD2:BOOL=OFF
- ENABLE_MODEL_ROLLING_EPSD3:BOOL=OFF
- ENABLE_MODEL_ROLLING_LUDING:BOOL=OFF
- ENABLE_MODEL_ROLLING_OFF:BOOL=OFF
Expand Down
13 changes: 7 additions & 6 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,17 @@ OPTION(ENABLE_MODEL_TANGENTIAL_NO_HISTORY "Tangential Model No History" ${DEFAUL
OPTION(ENABLE_MODEL_TANGENTIAL_LUDING "Tangential Model Luding" ${DEFAULT_OFF})

# 5 cohesion models
OPTION(ENABLE_MODEL_COHESION_OFF "Cohesion Model Off" ${DEFAULT_OFF})
OPTION(ENABLE_MODEL_COHESION_SJKR "Cohesion Model SJKR" ${DEFAULT_ON})
OPTION(ENABLE_MODEL_COHESION_SJKR2 "Cohesion Model SJKR2" ${DEFAULT_ON})
OPTION(ENABLE_MODEL_COHESION_OFF "Cohesion Model Off" ${DEFAULT_ON})
OPTION(ENABLE_MODEL_COHESION_SJKR "Cohesion Model SJKR" ${DEFAULT_OFF})
OPTION(ENABLE_MODEL_COHESION_SJKR2 "Cohesion Model SJKR2" ${DEFAULT_OFF})
OPTION(ENABLE_MODEL_COHESION_WASHINO_CAPILLARY_VISCOUS "Cohesion Model Washino/capillary/viscous" ${DEFAULT_OFF})
OPTION(ENABLE_MODEL_COHESION_EASO_CAPILLARY_VISCOUS "Cohesion Model Easo/capillary/viscous" ${DEFAULT_OFF})

# 6 rolling models
OPTION(ENABLE_MODEL_ROLLING_OFF "Rolling Model Off" ${DEFAULT_OFF})
OPTION(ENABLE_MODEL_ROLLING_CDT "Rolling Model CDT" ${DEFAULT_OFF})
OPTION(ENABLE_MODEL_ROLLING_CDT "Rolling Model CDT" ${DEFAULT_ON})
OPTION(ENABLE_MODEL_ROLLING_EPSD "Rolling Model EPSD" ${DEFAULT_OFF})
OPTION(ENABLE_MODEL_ROLLING_EPSD2 "Rolling Model EPSD2" ${DEFAULT_ON})
OPTION(ENABLE_MODEL_ROLLING_EPSD2 "Rolling Model EPSD2" ${DEFAULT_OFF})
OPTION(ENABLE_MODEL_ROLLING_EPSD3 "Rolling Model ESPD3" ${DEFAULT_OFF})
OPTION(ENABLE_MODEL_ROLLING_LUDING "Rolling Model Luding" ${DEFAULT_OFF})

Expand Down Expand Up @@ -540,7 +540,8 @@ INSTALL(TARGETS liggghts_bin liggghts_static liggghts_shared
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
PUBLIC_HEADER DESTINATION include)
PUBLIC_HEADER DESTINATION include/liggghts)

IF(WIN32)
INSTALL(DIRECTORY WINDOWS DESTINATION include)
ENDIF()