From 00a78cfa1a98b7eaf916ce70704c7e83786f3ef9 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sun, 20 Aug 2017 08:30:09 -0600 Subject: [PATCH 1/4] cmake: add LAMMPS_SUFFIX --- cmake/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 76c28fcb72..66f0dd62ce 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -520,9 +520,12 @@ include_directories(${LAMMPS_STYLE_HEADERS_DIR}) ########################################### # Actually add executable and lib to build ############################################ +set(LAMMPS_SUFFIX "" CACHE STRING "Suffix to append to lmp binary and liblammps") +mark_as_advanced(LAMMPS_SUFFIX) + add_library(lammps ${LIB_SOURCES}) target_link_libraries(lammps ${LAMMPS_LINK_LIBS}) -set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION}) +set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION} OUTPUT_NAME lammps${LAMMPS_SUFFIX}) 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}) @@ -532,9 +535,10 @@ endif() add_executable(lmp ${LMP_SOURCES}) target_link_libraries(lmp lammps) +set_target_properties(lmp PROPERTIES OUTPUT_NAME lmp${LAMMPS_SUFFIX}) install(TARGETS lmp DESTINATION ${CMAKE_INSTALL_BINDIR}) if(ENABLE_TESTING) - add_test(ShowHelp ${CMAKE_CURRENT_BINARY_DIR}/lmp -help) + add_test(ShowHelp lmp${LAMMPS_SUFFIX} -help) endif() ################################## From de5883b7bb8176ac53a76c123fe4f17c29a290fe Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sun, 20 Aug 2017 09:27:12 -0600 Subject: [PATCH 2/4] cmake: LAMMPS_SUFFIX -> LAMMPS_MACHINE --- cmake/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 66f0dd62ce..3582fe96aa 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -520,12 +520,12 @@ include_directories(${LAMMPS_STYLE_HEADERS_DIR}) ########################################### # Actually add executable and lib to build ############################################ -set(LAMMPS_SUFFIX "" CACHE STRING "Suffix to append to lmp binary and liblammps") -mark_as_advanced(LAMMPS_SUFFIX) +set(LAMMPS_MACHINE "" CACHE STRING "Suffix to append to lmp binary and liblammps") +mark_as_advanced(LAMMPS_MACHINE) add_library(lammps ${LIB_SOURCES}) target_link_libraries(lammps ${LAMMPS_LINK_LIBS}) -set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION} OUTPUT_NAME lammps${LAMMPS_SUFFIX}) +set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION} OUTPUT_NAME lammps${LAMMPS_MACHINE}) 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}) @@ -535,10 +535,10 @@ endif() add_executable(lmp ${LMP_SOURCES}) target_link_libraries(lmp lammps) -set_target_properties(lmp PROPERTIES OUTPUT_NAME lmp${LAMMPS_SUFFIX}) +set_target_properties(lmp PROPERTIES OUTPUT_NAME lmp${LAMMPS_MACHINE}) install(TARGETS lmp DESTINATION ${CMAKE_INSTALL_BINDIR}) if(ENABLE_TESTING) - add_test(ShowHelp lmp${LAMMPS_SUFFIX} -help) + add_test(ShowHelp lmp${LAMMPS_MACHINE} -help) endif() ################################## From 892a3f860922f5aa9b7879d1ca2ea0b021f2361c Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Sun, 20 Aug 2017 09:39:51 -0600 Subject: [PATCH 3/4] cmake: make _ in LAMMPS_MACHINE implicit --- cmake/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 3582fe96aa..650308dc93 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -525,7 +525,7 @@ mark_as_advanced(LAMMPS_MACHINE) add_library(lammps ${LIB_SOURCES}) target_link_libraries(lammps ${LAMMPS_LINK_LIBS}) -set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION} OUTPUT_NAME lammps${LAMMPS_MACHINE}) +set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION} OUTPUT_NAME lammps$<$:_>${LAMMPS_MACHINE}) 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}) @@ -535,7 +535,7 @@ endif() add_executable(lmp ${LMP_SOURCES}) target_link_libraries(lmp lammps) -set_target_properties(lmp PROPERTIES OUTPUT_NAME lmp${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${LAMMPS_MACHINE} -help) From 6d86697b3ff3a47936a8904959e71da15549da48 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mon, 21 Aug 2017 10:18:20 -0600 Subject: [PATCH 4/4] cmake: move option in user options block --- cmake/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 650308dc93..611f8f1682 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -74,6 +74,9 @@ if(LAMMPS_EXCEPTIONS) add_definitions(-DLAMMPS_EXCEPTIONS) endif() +set(LAMMPS_MACHINE "" CACHE STRING "Suffix to append to lmp binary and liblammps") +mark_as_advanced(LAMMPS_MACHINE) + option(CMAKE_VERBOSE_MAKEFILE "Verbose makefile" OFF) option(ENABLE_TESTING "Enable testing" OFF) @@ -520,9 +523,6 @@ include_directories(${LAMMPS_STYLE_HEADERS_DIR}) ########################################### # Actually add executable and lib to build ############################################ -set(LAMMPS_MACHINE "" CACHE STRING "Suffix to append to lmp binary and liblammps") -mark_as_advanced(LAMMPS_MACHINE) - add_library(lammps ${LIB_SOURCES}) target_link_libraries(lammps ${LAMMPS_LINK_LIBS}) set_target_properties(lammps PROPERTIES SOVERSION ${SOVERSION} OUTPUT_NAME lammps$<$:_>${LAMMPS_MACHINE})