need to forward some (more) cmake settings to external projects. simplify KIM... (0b6ab1d1) · Commits · 郑智淋 / lammps

cmake/Modules/Packages/KIM.cmake

+4 −6

Original line number	Diff line number	Diff line
		@@ -35,22 +35,20 @@ if(PKG_KIM)
		option(DOWNLOAD_KIM "Download KIM-API from OpenKIM instead of using an already installed one" ${DOWNLOAD_KIM_DEFAULT})
		if(DOWNLOAD_KIM)
		message(STATUS "KIM-API download requested - we will build our own")
		include(CheckLanguage)
		include(ExternalProject)
		enable_language(C)
		check_language(Fortran)
		if(NOT CMAKE_Fortran_COMPILER)
		message(FATAL_ERROR "Compiling the KIM-API library requires a Fortran compiler")
		endif()
		enable_language(Fortran)
		ExternalProject_Add(kim_build
		URL https://s3.openkim.org/kim-api/kim-api-2.1.3.txz
		URL_MD5 6ee829a1bbba5f8b9874c88c4c4ebff8
		BINARY_DIR build
		CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
		CMAKE_ARGS ${CMAKE_REQUEST_PIC}
		-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
		-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
		-DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}
		-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
		-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
		-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
		BUILD_BYPRODUCTS <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libkim-api${CMAKE_SHARED_LIBRARY_SUFFIX}
		)
		ExternalProject_get_property(kim_build INSTALL_DIR)

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ if(PKG_LATTE)
		-DBLAS_LIBRARIES=${BLAS_LIBRARIES} -DLAPACK_LIBRARIES=${LAPACK_LIBRARIES}
		-DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER} -DCMAKE_Fortran_FLAGS=${CMAKE_Fortran_FLAGS}
		-DCMAKE_Fortran_FLAGS_${BTYPE}=${CMAKE_Fortran_FLAGS_${BTYPE}} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
		-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
		BUILD_BYPRODUCTS <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/liblatte.a
		)
		ExternalProject_get_property(latte_build INSTALL_DIR)

+7 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,13 @@ if(PKG_MSCG)
		URL https://github.com/uchicago-voth/MSCG-release/archive/1.7.3.1.tar.gz
		URL_MD5 8c45e269ee13f60b303edd7823866a91
		SOURCE_SUBDIR src/CMake
		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> ${CMAKE_REQUEST_PIC} ${EXTRA_MSCG_OPTS}
		CMAKE_ARGS ${CMAKE_REQUEST_PIC} ${EXTRA_MSCG_OPTS}
		-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
		-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
		-DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}
		-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
		-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
		-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
		BUILD_COMMAND make mscg INSTALL_COMMAND ""
		BUILD_BYPRODUCTS <BINARY_DIR>/libmscg.a
		)