Merge branch 'collected-small-changes' of github.com:akohlmey/lammps into collected-small-changes (53bc791b) · Commits · 郑智淋 / lammps

cmake/presets/clang.cmake

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,5 +13,5 @@ set(OpenMP_C_LIB_NAMES "omp" CACHE STRING "" FORCE)
		set(OpenMP_CXX "clang++" CACHE STRING "" FORCE)
		set(OpenMP_CXX_FLAGS "-fopenmp" CACHE STRING "" FORCE)
		set(OpenMP_CXX_LIB_NAMES "omp" CACHE STRING "" FORCE)
		set(OpenMP_omp_LIBRARY "/usr/lib64/libomp.so" CACHE PATH "" FORCE)
		set(OpenMP_omp_LIBRARY "libomp.so" CACHE PATH "" FORCE)

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		# preset that will enable clang/clang++ with support for MPI and OpenMP (on Linux boxes)

		set(CMAKE_CXX_COMPILER "icpc" CACHE STRING "" FORCE)
		set(CMAKE_C_COMPILER "icc" CACHE STRING "" FORCE)
		set(CMAKE_CXX_FLAGS "-O3 -DNDEBG" CACHE STRING "" FORCE)
		set(MPI_CXX "icpc" CACHE STRING "" FORCE)
		set(MPI_CXX_COMPILER "mpicxx" CACHE STRING "" FORCE)
		unset(HAVE_OMP_H_INCLUDE CACHE)

		set(OpenMP_C "icc" CACHE STRING "" FORCE)
		set(OpenMP_C_FLAGS "-qopenmp" CACHE STRING "" FORCE)
		set(OpenMP_C_LIB_NAMES "omp" CACHE STRING "" FORCE)
		set(OpenMP_CXX "icpc" CACHE STRING "" FORCE)
		set(OpenMP_CXX_FLAGS "-qopenmp" CACHE STRING "" FORCE)
		set(OpenMP_CXX_LIB_NAMES "omp" CACHE STRING "" FORCE)
		set(OpenMP_omp_LIBRARY "libiomp5.so" CACHE PATH "" FORCE)

+5 −4

Original line number	Diff line number	Diff line
		@@ -146,13 +146,14 @@ one of them as a starting point and customize it to your needs.

		.. code-block:: bash

		cmake -C ../cmake/presets/all_on.cmake [OPTIONS] ../cmake # enable all packages
		cmake -C ../cmake/presets/all_off.cmake [OPTIONS] ../cmake # disable all packages
		cmake -C ../cmake/presets/minimal.cmake [OPTIONS] ../cmake # enable just a few core packages
		cmake -C ../cmake/presets/most.cmake [OPTIONS] ../cmake # enable most common packages
		cmake -C ../cmake/presets/most.cmake [OPTIONS] ../cmake # enable most packages
		cmake -C ../cmake/presets/nolib.cmake [OPTIONS] ../cmake # disable packages that do require extra libraries or tools
		cmake -C ../cmake/presets/clang.cmake [OPTIONS] ../cmake # change settings to use the Clang compilers by default
		cmake -C ../cmake/presets/mingw.cmake [OPTIONS] ../cmake # enable all packages compatible with MinGW compilers
		cmake -C ../cmake/presets/intel.cmake [OPTIONS] ../cmake # change settings to use the Intel compilers by default
		cmake -C ../cmake/presets/mingw.cmake [OPTIONS] ../cmake # enable packages compatible with MinGW compilers for Windows
		cmake -C ../cmake/presets/all_on.cmake [OPTIONS] ../cmake # enable all packages
		cmake -C ../cmake/presets/all_off.cmake [OPTIONS] ../cmake # disable all packages

		.. note::