cmake: change too generic LIB_SUFFIX to LAMMPS_LIB_SUFFIX (499ffa19) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+9 −9

Original line number	Diff line number	Diff line
		@@ -121,10 +121,10 @@ if(BUILD_LIB)
		if(BUILD_SHARED_LIBS) # for all pkg libs, mpi_stubs and linalg
		set(CMAKE_POSITION_INDEPENDENT_CODE ON)
		endif()
		set(LIB_SUFFIX "" CACHE STRING "Suffix to append to liblammps and pkg-config file")
		mark_as_advanced(LIB_SUFFIX)
		if(LIB_SUFFIX)
		set(LIB_SUFFIX "_${LIB_SUFFIX}")
		set(LAMMPS_LIB_SUFFIX "" CACHE STRING "Suffix to append to liblammps and pkg-config file")
		mark_as_advanced(LAMMPS_LIB_SUFFIX)
		if(LAMMPS_LIB_SUFFIX)
		set(LAMMPS_LIB_SUFFIX "_${LAMMPS_LIB_SUFFIX}")
		endif()
		endif()

		@@ -1040,14 +1040,14 @@ if(BUILD_LIB)
		if(LAMMPS_DEPS)
		add_dependencies(lammps ${LAMMPS_DEPS})
		endif()
		set_target_properties(lammps PROPERTIES OUTPUT_NAME lammps${LIB_SUFFIX})
		set_target_properties(lammps PROPERTIES OUTPUT_NAME lammps${LAMMPS_LIB_SUFFIX})
		set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION})
		install(TARGETS lammps LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
		install(FILES ${LAMMPS_SOURCE_DIR}/library.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lammps)
		configure_file(pkgconfig/liblammps.pc.in ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LIB_SUFFIX}.pc @ONLY)
		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
		configure_file(FindLAMMPS.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindLAMMPS${LIB_SUFFIX}.cmake @ONLY)
		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindLAMMPS${LIB_SUFFIX}.cmake DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/Module)
		configure_file(pkgconfig/liblammps.pc.in ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LAMMPS_LIB_SUFFIX}.pc @ONLY)
		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LAMMPS_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
		configure_file(FindLAMMPS.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindLAMMPS${LAMMPS_LIB_SUFFIX}.cmake @ONLY)
		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindLAMMPS${LAMMPS_LIB_SUFFIX}.cmake DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/Module)
		else()
		list(APPEND LMP_SOURCES ${LIB_SOURCES})
		endif()

cmake/FindLAMMPS.cmake.in

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,13 +23,13 @@

		find_package(PkgConfig)

		pkg_check_modules(PC_LAMMPS liblammps@LIB_SUFFIX@)
		pkg_check_modules(PC_LAMMPS liblammps@LAMMPS_LIB_SUFFIX@)
		find_path(LAMMPS_INCLUDE_DIR lammps/library.h HINTS ${PC_LAMMPS_INCLUDE_DIRS} @CMAKE_INSTALL_FULL_INCLUDEDIR@)

		# TODO figure out library version from header
		set(LAMMPS_VERSION 20180822)

		find_library(LAMMPS_LIBRARY NAMES lammps@LIB_SUFFIX@ HINTS ${PC_LAMMPS_LIBRARY_DIRS} @CMAKE_INSTALL_FULL_LIBDIR@)
		find_library(LAMMPS_LIBRARY NAMES lammps@LAMMPS_LIB_SUFFIX@ HINTS ${PC_LAMMPS_LIBRARY_DIRS} @CMAKE_INSTALL_FULL_LIBDIR@)

		set(LAMMPS_INCLUDE_DIRS "${LAMMPS_INCLUDE_DIR}")
		set(LAMMPS_LIBRARIES "${LAMMPS_LIBRARY}")

cmake/pkgconfig/liblammps.pc.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,6 +13,6 @@ Description: Large-scale Atomic/Molecular Massively Parallel Simulator Library
		URL: http://lammps.sandia.gov
		Version:
		Requires:
		Libs: -L${libdir} -llammps@LIB_SUFFIX@@
		Libs: -L${libdir} -llammps@LAMMPS_LIB_SUFFIX@@
		Libs.private: -lm
		Cflags: -I${includedir} @LAMMPS_API_DEFINES@

Admin message