Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
argo
Applications
LAMMPS
Commits
499ffa19
Commit
499ffa19
authored
Aug 29, 2018
by
Christoph Junghans
Browse files
cmake: change too generic LIB_SUFFIX to LAMMPS_LIB_SUFFIX
parent
c5861307
Changes
3
Hide whitespace changes
Inline
Side-by-side
cmake/CMakeLists.txt
View file @
499ffa19
...
...
@@ -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
View file @
499ffa19
...
...
@@ -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
View file @
499ffa19
...
...
@@ -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@
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment