more packages with default-to-download-if-lib-not-found (e57e4a73) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+25 −4

Original line number	Original line	Diff line number	Diff line
	@@ -575,7 +575,16 @@ if(PKG_USER-PLUMED)
	validate_option(PLUMED_MODE PLUMED_MODE_VALUES)		validate_option(PLUMED_MODE PLUMED_MODE_VALUES)
	string(TOUPPER ${PLUMED_MODE} PLUMED_MODE)		string(TOUPPER ${PLUMED_MODE} PLUMED_MODE)

	option(DOWNLOAD_PLUMED "Download Plumed package instead of using an already installed one" OFF)		find_package(PkgConfig QUIET)
			set(DOWNLOAD_PLUMED_DEFAULT ON)
			if(PKG_CONFIG_FOUND)
			pkg_check_modules(PLUMED QUIET plumed)
			if(PLUMED_FOUND)
			set(DOWNLOAD_PLUMED_DEFAULT OFF)
			endif()
			endif()

			option(DOWNLOAD_PLUMED "Download Plumed package instead of using an already installed one" ${DOWNLOAD_PLUMED_DEFAULT})
	if(DOWNLOAD_PLUMED)		if(DOWNLOAD_PLUMED)
	if(BUILD_MPI)		if(BUILD_MPI)
	set(PLUMED_CONFIG_MPI "--enable-mpi")		set(PLUMED_CONFIG_MPI "--enable-mpi")
	@@ -620,7 +629,7 @@ if(PKG_USER-PLUMED)
	set(PLUMED_INCLUDE_DIRS "${PLUMED_INSTALL_DIR}/include")		set(PLUMED_INCLUDE_DIRS "${PLUMED_INSTALL_DIR}/include")
	else()		else()
	find_package(PkgConfig REQUIRED)		find_package(PkgConfig REQUIRED)
	pkg_check_modules(PLUMED plumed REQUIRED)		pkg_check_modules(PLUMED REQUIRED plumed)
	if(PLUMED_MODE STREQUAL "STATIC")		if(PLUMED_MODE STREQUAL "STATIC")
	add_definitions(-D__PLUMED_WRAPPER_CXX=1)		add_definitions(-D__PLUMED_WRAPPER_CXX=1)
	include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.static)		include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.static)
	@@ -654,7 +663,13 @@ if(PKG_USER-NETCDF)
	endif()		endif()

	if(PKG_USER-SMD)		if(PKG_USER-SMD)
	option(DOWNLOAD_EIGEN3 "Download Eigen3 instead of using an already installed one)" OFF)		find_package(Eigen3 NO_MODULE)
			if(EIGEN3_FOUND)
			set(DOWNLOAD_EIGEN3_DEFAULT OFF)
			else()
			set(DOWNLOAD_EIGEN3_DEFAULT ON)
			endif()
			option(DOWNLOAD_EIGEN3 "Download Eigen3 instead of using an already installed one)" ${DOWNLOAD_EIGEN3_DEFAULT})
	if(DOWNLOAD_EIGEN3)		if(DOWNLOAD_EIGEN3)
	message(STATUS "Eigen3 download requested - we will build our own")		message(STATUS "Eigen3 download requested - we will build our own")
	include(ExternalProject)		include(ExternalProject)
	@@ -767,7 +782,13 @@ endif()

	if(PKG_MSCG)		if(PKG_MSCG)
	find_package(GSL REQUIRED)		find_package(GSL REQUIRED)
	option(DOWNLOAD_MSCG "Download MSCG library instead of using an already installed one)" OFF)		find_package(MSCG QUIET)
			if(MSGC_FOUND)
			set(DOWNLOAD_MSCG_DEFAULT OFF)
			else()
			set(DOWNLOAD_MSCG_DEFAULT ON)
			endif()
			option(DOWNLOAD_MSCG "Download MSCG library instead of using an already installed one)" ${DOWNLOAD_MSCG_DEFAULT})
	if(DOWNLOAD_MSCG)		if(DOWNLOAD_MSCG)
	if (CMAKE_VERSION VERSION_LESS "3.7") # due to SOURCE_SUBDIR		if (CMAKE_VERSION VERSION_LESS "3.7") # due to SOURCE_SUBDIR
	message(FATAL_ERROR "For downlading MSCG you need at least cmake-3.7")		message(FATAL_ERROR "For downlading MSCG you need at least cmake-3.7")

Admin message