From 57872c8b60be02590788c23f32d5d4e2541e2fd6 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sun, 27 Aug 2017 18:42:32 -0600 Subject: [PATCH] drop INSTALL_LIB option --- cmake/CMakeLists.txt | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index e038f4d619..a63a67e6cc 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -44,10 +44,6 @@ include(CheckCCompilerFlag) ######################################################################## option(BUILD_SHARED_LIBS "Build shared libs" OFF) option(BUILD_SHARED_PKG_LIBS "Build package libs shared" OFF) -option(INSTALL_LIB "Install lammps library and header" ON) -if(NOT INSTALL_LIB AND ( BUILD_SHARED_LIBS OR BUILD_SHARED_PKG_LIBS ) ) - message(FATAL_ERROR "Shared libs need to be installed, enable install with -DINSTALL_LIB=ON") -endif() if(BUILD_SHARED_LIBS OR BUILD_SHARED_PKG_LIBS) set(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() @@ -68,12 +64,10 @@ else() if(BUILD_SHARED_PKG_LIBS) add_library(mpi_stubs SHARED ${MPI_SOURCES}) set_target_properties(mpi_stubs PROPERTIES SOVERSION ${SOVERSION}) - if(INSTALL_LIB) - install(TARGETS mpi_stubs LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() else() add_library(mpi_stubs STATIC ${MPI_SOURCES}) endif() + install(TARGETS mpi_stubs LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) include_directories(${LAMMPS_SOURCE_DIR}/STUBS) list(APPEND LAMMPS_LINK_LIBS mpi_stubs) endif() @@ -187,12 +181,10 @@ if(ENABLE_MSCG OR ENABLE_USER-ATC OR ENABLE_USER-AWPMD OR ENABLE_USER-QUIP) if(BUILD_SHARED_PKG_LIBS) add_library(linalg SHARED ${LAPACK_SOURCES}) set_target_properties(${PKG_LIB} PROPERTIES SOVERSION ${SOVERSION}) - if(INSTALL_LIB) - install(TARGETS linalg LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() else() add_library(linalg STATIC ${LAPACK_SOURCES}) endif() + install(TARGETS linalg LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) include(CheckFortranCompilerFlag) check_Fortran_compiler_flag("-fno-second-underscore" FC_HAS_NO_SECOND_UNDERSCORE) if(FC_HAS_NO_SECOND_UNDERSCORE) @@ -315,12 +307,10 @@ if(ENABLE_MSCG) if(BUILD_SHARED_PKG_LIBS) add_library(mscg SHARED ${MSCG_SOURCES}) set_target_properties(mscg PROPERTIES SOVERSION ${SOVERSION}) - if(INSTALL_LIB) - install(TARGETS mscg LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() else() add_library(mscg STATIC ${MSCG_SOURCES}) endif() + install(TARGETS mscg LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) list(APPEND LAMMPS_LINK_LIBS mscg) target_compile_options(mscg PRIVATE -DDIMENSION=3 -D_exclude_gromacs=1) target_include_directories(mscg PUBLIC ${LAMMPS_LIB_MSCG_BIN_DIR}) @@ -384,12 +374,10 @@ foreach(SIMPLE_LIB REAX MEAM POEMS USER-ATC USER-AWPMD USER-COLVARS USER-H5MD if(BUILD_SHARED_PKG_LIBS) add_library(${PKG_LIB} SHARED ${${PKG_LIB}_SOURCES}) set_target_properties(${PKG_LIB} PROPERTIES SOVERSION ${SOVERSION}) - if(INSTALL_LIB) - install(TARGETS ${PKG_LIB} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() else() add_library(${PKG_LIB} STATIC ${${PKG_LIB}_SOURCES}) endif() + install(TARGETS ${PKG_LIB} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) list(APPEND LAMMPS_LINK_LIBS ${PKG_LIB}) if(PKG_LIB STREQUAL awpmd) target_include_directories(awpmd PUBLIC ${LAMMPS_LIB_SOURCE_DIR}/awpmd/systems/interact ${LAMMPS_LIB_SOURCE_DIR}/awpmd/ivutils/include) @@ -614,10 +602,8 @@ include_directories(${LAMMPS_STYLE_HEADERS_DIR}) add_library(lammps ${LIB_SOURCES}) target_link_libraries(lammps ${LAMMPS_LINK_LIBS}) set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION}) -if(INSTALL_LIB) - install(TARGETS lammps LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES ${LAMMPS_SOURCE_DIR}/lammps.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -endif() +install(TARGETS lammps LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(FILES ${LAMMPS_SOURCE_DIR}/lammps.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) add_executable(lmp ${LMP_SOURCES}) target_link_libraries(lmp lammps)