cmake: fix lib suffix (1601433c) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+8 −4

Original line number	Diff line number	Diff line
		@@ -80,6 +80,9 @@ endif()

		set(LAMMPS_MACHINE "" CACHE STRING "Suffix to append to lmp binary and liblammps (WON'T enable any features automatically")
		mark_as_advanced(LAMMPS_MACHINE)
		if(LAMMPS_MACHINE)
		set(LAMMPS_MACHINE "_${LAMMPS_MACHINE}")
		endif()

		option(CMAKE_VERBOSE_MAKEFILE "Verbose makefile" OFF)

		@@ -643,20 +646,21 @@ include_directories(${LAMMPS_STYLE_HEADERS_DIR})
		############################################
		add_library(lammps ${LIB_SOURCES})
		target_link_libraries(lammps ${LAMMPS_LINK_LIBS})
		set_target_properties(lammps PROPERTIES OUTPUT_NAME lammps${LAMMPS_MACHINE})
		if(BUILD_SHARED_LIBS)
		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.pc @ONLY)
		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblammps.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
		configure_file(pkgconfig/liblammps.pc.in ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LAMMPS_MACHINE}.pc @ONLY)
		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblammps${LAMMPS_MACHINE}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
		endif()

		add_executable(lmp ${LMP_SOURCES})
		target_link_libraries(lmp lammps)
		set_target_properties(lmp PROPERTIES OUTPUT_NAME lmp$<$<BOOL:${LAMMPS_MACHINE}>:_>${LAMMPS_MACHINE})
		set_target_properties(lmp PROPERTIES OUTPUT_NAME lmp${LAMMPS_MACHINE})
		install(TARGETS lmp DESTINATION ${CMAKE_INSTALL_BINDIR})
		if(ENABLE_TESTING)
		add_test(ShowHelp lmp$<$<BOOL:${LAMMPS_MACHINE}>:_>${LAMMPS_MACHINE} -help)
		add_test(ShowHelp lmp${LAMMPS_MACHINE} -help)
		endif()

		##################################

cmake/pkgconfig/liblammps.pc.in

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,11 +8,11 @@ prefix=@CMAKE_INSTALL_FULL_PREFIX@
		libdir=@CMAKE_INSTALL_FULL_LIBDIR@
		includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@

		Name: liblammps
		Name: liblammps@LAMMPS_MACHINE@
		Description: Large-scale Atomic/Molecular Massively Parallel Simulator Library
		URL: http://lammps.sandia.gov
		Version:
		Requires:
		Libs: -L${libdir} -llammps
		Libs: -L${libdir} -llammps@LAMMPS_MACHINE@
		Libs.private: -lm
		Cflags: -I${includedir} @LAMMPS_API_DEFINES@

Admin message