Merge remote-tracking branch 'github/junghans-CMake-typo' into correct-kokkos-docs (b83840c2) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
		option(ENABLE_COVERAGE "Enable collecting code coverage data" OFF)
		mark_as_advanced(ENABLE_COVERAGE)
		if(ENABLE_COVERAGE)
		set (CMAK_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
		endif()
		endif()

+32 −28

Original line number	Diff line number	Diff line
		@@ -2,7 +2,8 @@ include(CMakeFindDependencyMacro)
		if(@BUILD_MPI@)
		find_dependency(MPI REQUIRED CXX)
		endif()
		if(@PKG_KSPACE@ AND @FFT@ STREQUAL "FFTW3")
		if(@PKG_KSPACE@)
		if(@FFT@ STREQUAL "FFTW3")
		if(@FFTW@ STREQUAL "FFTW3" AND NOT TARGET FFTW3::FFTW3)
		add_library(FFTW3::FFTW3 UNKNOWN IMPORTED)
		set_target_properties(FFTW3::FFTW3 PROPERTIES
		@@ -18,6 +19,7 @@ if(@PKG_KSPACE@ AND @FFT@ STREQUAL "FFTW3")
		INTERFACE_INCLUDE_DIRECTORIES "@FFTW3F_INCLUDE_DIRS@")
		endif()
		endif()
		endif()
		if(NOT @BUILD_SHARED_LIBS@)
		if(@WITH_JPEG@)
		find_dependency(JPEG REQUIRED)
		@@ -36,7 +38,8 @@ if(NOT @BUILD_SHARED_LIBS@)
		if(@PKG_USER-SMD@ AND NOT @DOWNLOAD_EIGEN3@)
		find_dependency(Eigen3 NO_MODULE REQUIRED)
		endif()
		if(@PKG_KSPACE@ AND @FFT@ STREQUAL "FFTW3" AND @FFT_FFTW_THREADS@)
		if(@PKG_KSPACE@)
		if(@FFT@ STREQUAL "FFTW3" AND @FFT_FFTW_THREADS@)
		if(@FFTW@ STREQUAL "FFTW3" AND NOT TARGET FFTW3::FFTW3_OMP)
		add_library(FFTW3::FFTW3_OMP UNKNOWN IMPORTED)
		set_target_properties(FFTW3::FFTW3_OMP PROPERTIES
		@@ -52,6 +55,7 @@ if(NOT @BUILD_SHARED_LIBS@)
		INTERFACE_INCLUDE_DIRECTORIES "@FFTW3F_OMP_INCLUDE_DIRS@")
		endif()
		endif()
		endif()
		if(@PKG_USER-SCAFACOS@ AND NOT @DOWNLOAD_SCAFACOS@)
		find_dependency(PkgConfig REQUIRED)
		pkg_check_modules(SCAFACOS REQUIRED IMPORTED_TARGET scafacos)

+3 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,9 @@ if(DOWNLOAD_KIM)
		INTERFACE_INCLUDE_DIRECTORIES "${INSTALL_DIR}/include/kim-api")
		target_link_libraries(lammps PRIVATE LAMMPS::KIM)
		add_dependencies(LAMMPS::KIM kim_build)
		if(BUILD_LIB AND NOT BUILD_SHARED_LIBS)
		install(CODE "MESSAGE(FATAL_ERROR \"Installing liblammps with downloaded libraries is currently not supported.\")")
		endif()
		else()
		find_package(PkgConfig REQUIRED)
		pkg_check_modules(KIM-API REQUIRED IMPORTED_TARGET libkim-api>=${KIM-API_MIN_VERSION})

+3 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,9 @@ if(DOWNLOAD_KOKKOS)
		INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS})
		target_link_libraries(lammps PRIVATE LAMMPS::KOKKOS)
		add_dependencies(LAMMPS::KOKKOS kokkos_build)
		if(BUILD_LIB AND NOT BUILD_SHARED_LIBS)
		install(CODE "MESSAGE(FATAL_ERROR \"Installing liblammps with downloaded libraries is currently not supported.\")")
		endif()
		elseif(EXTERNAL_KOKKOS)
		find_package(Kokkos 3)
		if(NOT Kokkos_FOUND)

+3 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,9 @@ if(DOWNLOAD_LATTE)
		INTERFACE_LINK_LIBRARIES "${LAPACK_LIBRARIES}")
		target_link_libraries(lammps PRIVATE LAMMPS::LATTE)
		add_dependencies(LAMMPS::LATTE latte_build)
		if(BUILD_LIB AND NOT BUILD_SHARED_LIBS)
		install(CODE "MESSAGE(FATAL_ERROR \"Installing liblammps with downloaded libraries is currently not supported.\")")
		endif()
		else()
		find_package(LATTE)
		if(NOT LATTE_FOUND)