jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,914 Commits 9 Branches 198 Tags 1.1 GiB
Commit Graph

328 Commits

Author SHA1 Message Date
Axel Kohlmeyer a557644939 support all three plumed linkage modes with CMake as well. For downloaded and previously installed plumed lib 2018-11-14 22:13:18 -05:00
Axel Kohlmeyer e0955f6434 Merge branch 'master' into sdpd to resolve merge conflicts 
# Conflicts:
#	cmake/CMakeLists.txt
#	src/Makefile
 2018-11-08 16:32:02 -05:00
Axel Kohlmeyer a6e9b99295
Merge pull request #1180 from gtribello/master 
Add natively supported PLUMED interface to LAMMPS
 2018-11-08 16:16:50 -05:00
Christoph Junghans ce7f76de1d cmake: switch plumed to full static mode 2018-11-05 07:39:23 -07:00
Christoph Junghans 58d2f0cc57 cmake: fix linking again plumed 2018-11-05 05:55:31 -07:00
Axel Kohlmeyer 7514838700 put LAMMPS sources folder first in list of include directories 2018-10-31 04:18:08 -04:00
Morteza Jalalvand e70a9b0f26 updated CMakeLists to handle the optional dependency of USER-SDPD 2018-10-30 19:35:22 +03:30
Morteza Jalalvand ba6f6f73f1 first commit: added SDPD 2018-10-30 17:40:00 +03:30
Christoph Junghans 044507640f include Plumed.h with full path 2018-10-29 06:52:19 -06:00
Christoph Junghans bcc7a4c32f cmake: add PLUMED include dir 2018-10-29 06:36:47 -06:00
Christoph Junghans 3cc9384488 cmake: add support USER-PLUMED 2018-10-28 16:23:29 -06:00
Axel Kohlmeyer f542590090
Merge pull request #1136 from junghans/cmake_out_source 
cmake: prevent in-source build
 2018-10-19 17:02:05 -04:00
Christoph Junghans 2da999d864 cmake: prevent in-source build 2018-09-27 12:18:43 -06:00
Axel Kohlmeyer 93e56c113a add USER-PTM to build system 2018-09-25 09:18:11 -04:00
Richard Berger a903e64947
Merge pull request #1114 from junghans/cmake_eigen3 
cmake: fix Eigen3 detection
 2018-09-10 10:45:20 -04:00
Richard Berger 46b87518b8 cmake: use NO_MODULE for Eigen3 2018-09-10 00:35:55 -04:00
Axel Kohlmeyer 3b073de357 make it less likely to have people get confused by Eigen3_DIR 2018-09-09 01:21:37 -04:00
Christoph Junghans 861a7acdf0 cmake: fix globbing in some more places 2018-09-07 06:40:06 -06:00
Christoph Junghans 8f8aee65d2 cmake: fix globbing of emacs files 
Done by: sed -i '/GLOB/s@/\*\.@/[^.]*.@g' CMakeLists.txt
 2018-09-06 14:52:49 -06:00
Christoph Junghans d7b00f86f8 cmake: fix Eigen3 detection 
For some reason FindEigen3.cmake defines all cap. variables, i.e.
Eigen3_FOUND -> EIGEN3_FOUND
 2018-09-06 14:18:31 -06:00
Richard Berger 0b951840f2
Merge pull request #1103 from rbberger/cmake-fix-user-omp 
cmake: add missing fix_omp.h and fix_omp.cpp to compilation
 2018-09-05 21:27:24 -04:00
Richard Berger ad498811b1 cmake: add missing fix_omp.h and fix_omp.cpp to compilation 2018-09-05 16:04:35 -04:00
Richard Berger a28990ed8d
Merge pull request #989 from rhalver/ScaFaCoS 
[Feature Contribution] Scafacos
 2018-09-05 11:24:13 -04:00
Richard Berger 09ef2bc829
Merge pull request #1093 from rbberger/cmake-fixes 
Collection of CMake fixes
 2018-09-04 21:51:47 -04:00
Richard Berger ff2e13e063 Merge branch 'master' into ScaFaCoS 2018-09-04 21:35:46 -04:00
Richard Berger 8608b4f93c Remove extra libm in LAMMPS_LINK_LIBS 2018-09-04 21:31:08 -04:00
Christoph Junghans db7c2549d0
cmake: inject with-pic into Scafacos 2018-09-04 17:05:59 -06:00
Christoph Junghans 037420b611 cmake: only add tests if exe is build 2018-09-04 14:59:30 -06:00
Richard Berger af4b2b9354 Add LAMMPS_TESTING_SOURCE_DIR and LAMMPS_TESTING_GIT_TAG options 2018-09-04 15:37:32 -04:00
Richard Berger 842136afc8 Add core tests to CMake 2018-09-04 12:12:49 -04:00
Richard Berger f18f12d1a6 Fix NETCDF include and libs in CMake 2018-09-04 09:15:00 -04:00
Steve Plimpton a299a7fa28 Merge branch 'cslib' of github.com:lammps/lammps into cslib 2018-08-31 16:37:19 -06:00
Steve Plimpton 78301e5e93 Merge branch 'master' into cslib 2018-08-31 16:30:28 -06:00
Richard Berger b0f5400d52 Add utility function to determine LAMMPS version in CMake 2018-08-29 16:12:16 -04:00
Christoph Junghans 499ffa198d cmake: change too generic LIB_SUFFIX to LAMMPS_LIB_SUFFIX 2018-08-29 11:31:28 -06:00
Christoph Junghans c5861307f6 cmake: add FindLAMMPS.cmake.in 2018-08-29 10:58:09 -06:00
Steve Plimpton 40e7ea83a3
Merge pull request #1084 from rbberger/cmake-and-warning-suppression-bugs 
Fixes various compilation issues
 2018-08-29 07:49:52 -06:00
Steve Plimpton a8f1fe8f96
Merge pull request #1078 from junghans/manpage 
added manpage from debian package
 2018-08-29 07:48:48 -06:00
Richard Berger 0860b9e674 Build cslib static or as shared 2018-08-29 07:52:16 -04:00
Richard Berger a7e9076bc0 Rename to libcsmpi/libcsnompi like in Makefile 2018-08-29 07:30:53 -04:00
Richard Berger 4c32a551bd Rename to libcs.a 2018-08-29 07:24:38 -04:00
Richard Berger 6ea33e3e89 Fix typo and use ZMQ stubs in CMake when necessary 2018-08-29 06:51:20 -04:00
Richard Berger 30d45e6773 Ensure MESSAGE files are added to CMake compilation 2018-08-28 15:22:43 -04:00
Richard Berger cb318f55e9 Add missing or lost cmake changes 2018-08-28 10:11:16 -04:00
Richard Berger 02f131c544 Fix USER-OMP compilation with CMake 2018-08-27 22:11:15 -04:00
Richard Berger aac238503b Add missing LMP_USER_OMP definition with CMake 2018-08-27 21:23:47 -04:00
Steve Plimpton a2ec8d3f21
Merge pull request #1083 from junghans/cmake_fix_potential_location 
cmake: fix install of potential files
 2018-08-27 17:15:47 -06:00
Steve Plimpton 62a1dcba55
Merge pull request #1081 from junghans/cmake_sort_packages 
cmake: sort package in header
 2018-08-27 17:15:17 -06:00
Christoph Junghans 5189bc4f4b cmake: fix install of potential files 
Add an '/' at the end avoids the double potentials/ subdir.
 2018-08-26 07:57:57 -06:00
Christoph Junghans 9ed6d0a9d1 cmake: sort package in header 2018-08-24 15:27:15 -06:00