Unverified Commit 2ffb29f6 authored by Richard Berger's avatar Richard Berger
Browse files

Merge remote-tracking branch 'origin/master' into refactor-reading

parents c9dc5d90 23a8b343

.gitattributes

0 → 100644
+3 −0
Original line number Diff line number Diff line 
.gitattributes export-ignore

.gitignore export-ignore

.github export-ignore

cmake/CMakeLists.txt

+7 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ endif() 
# we require C++11 without extensions

set(CMAKE_CXX_STANDARD 11)

set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(CMAKE_CXX_EXTENSIONS OFF)

set(CMAKE_CXX_EXTENSIONS OFF CACHE BOOL "Use compiler extensions")



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

# User input options                                                   #
@@ -747,6 +747,12 @@ if (${_index} GREATER -1) 
endif()

message(STATUS "<<< Linker flags: >>>")

message(STATUS "Executable name:  ${LAMMPS_BINARY}")

if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13)

  get_target_property(OPTIONS lammps LINK_OPTIONS)

  if(OPTIONS)

    message(STATUS "Linker options:   ${OPTIONS}")

  endif()

endif()

if(CMAKE_EXE_LINKER_FLAGS)

  message(STATUS "Executable linker flags: ${CMAKE_EXE_LINKER_FLAGS}")

endif()

cmake/Modules/GTest.cmake

+4 −4
Original line number Diff line number Diff line
@@ -52,26 +52,26 @@ add_library(GTest::GTest UNKNOWN IMPORTED) 
set_target_properties(GTest::GTest PROPERTIES

        IMPORTED_LOCATION ${GTEST_LIBRARY_PATH}

        INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR}

        IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})

        INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")

add_dependencies(GTest::GTest googletest)



add_library(GTest::GMock UNKNOWN IMPORTED)

set_target_properties(GTest::GMock PROPERTIES

        IMPORTED_LOCATION ${GMOCK_LIBRARY_PATH}

        INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIR}

        IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})

        INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")

add_dependencies(GTest::GMock googletest)



add_library(GTest::GTestMain UNKNOWN IMPORTED)

set_target_properties(GTest::GTestMain PROPERTIES

        IMPORTED_LOCATION ${GTEST_MAIN_LIBRARY_PATH}

        INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR}

        IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})

        INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")

add_dependencies(GTest::GTestMain googletest)



add_library(GTest::GMockMain UNKNOWN IMPORTED)

set_target_properties(GTest::GMockMain PROPERTIES

        IMPORTED_LOCATION ${GMOCK_MAIN_LIBRARY_PATH}

        INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIR}

        IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})

        INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")

add_dependencies(GTest::GMockMain googletest)

cmake/Modules/Testing.cmake

+27 −0
Original line number Diff line number Diff line
@@ -16,6 +16,33 @@ if(ENABLE_TESTING) 
  set(MEMORYCHECK_COMMAND "${VALGRIND_BINARY}" CACHE FILEPATH "Memory Check Command")

  set(MEMORYCHECK_COMMAND_OPTIONS "${VALGRIND_DEFAULT_OPTIONS}" CACHE STRING "Memory Check Command Options")



  # check if a faster linker is available.

  # only verified with GNU and Clang compilers and new CMake

  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13)

    if((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")

        OR (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang"))

      include(CheckCXXCompilerFlag)

      set(CMAKE_CUSTOM_LINKER_DEFAULT default)

      check_cxx_compiler_flag(-fuse-ld=lld HAVE_LLD_LINKER)

      check_cxx_compiler_flag(-fuse-ld=gold HAVE_GOLD_LINKER)

      check_cxx_compiler_flag(-fuse-ld=bfd HAVE_BFD_LINKER)

      if(HAVE_LLD_LINKER)

        set(CMAKE_CUSTOM_LINKER_DEFAULT lld)

      elseif(HAVE_GOLD_LINKER)

        set(CMAKE_CUSTOM_LINKER_DEFAULT gold)

      elseif(HAVE_BFD_LINKER)

        set(CMAKE_CUSTOM_LINKER_DEFAULT bfd)

      endif()

      set(CMAKE_CUSTOM_LINKER_VALUES lld gold bfd default)

      set(CMAKE_CUSTOM_LINKER ${CMAKE_CUSTOM_LINKER_DEFAULT} CACHE STRING "Choose a custom linker for faster linking (lld, gold, bfd, default)")

      validate_option(CMAKE_CUSTOM_LINKER CMAKE_CUSTOM_LINKER_VALUES)

      mark_as_advanced(CMAKE_CUSTOM_LINKER)

      if(NOT "${CMAKE_CUSTOM_LINKER}" STREQUAL "default")

        target_link_options(lammps PUBLIC -fuse-ld=${CMAKE_CUSTOM_LINKER})

      endif()

    endif()

  endif()



  include(CTest)



  enable_testing()

doc/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ html: $(ANCHORCHECK) $(MATHJAX) 
	@rm -rf html/JPG

	@cp -r src/PDF html/PDF

	@mkdir -p html/JPG

	@cp `grep -A2 '\.\. .*\(image\|figure\)::' src/*.rst | grep ':target:' | sed -e 's,.*:target: JPG/,src/JPG/,' | sort | uniq` html/JPG/

	@cp `grep -A2 '\.\. .*\(image\|figure\)::' src/*.rst | grep ':target: JPG' | sed -e 's,.*:target: JPG/,src/JPG/,' | sort | uniq` html/JPG/

	@rm -rf html/PDF/.[sg]*

	@mkdir -p html/_static/mathjax

	@cp -r $(MATHJAX)/es5 html/_static/mathjax/
@@ -194,9 +194,7 @@ $(VENV): 
		$(VIRTUALENV) -p $(PYTHON) $(VENV); \

		. $(VENV)/bin/activate; \

		pip install --upgrade pip; \

		pip install Sphinx; \

		pip install sphinxcontrib-spelling ;\

		pip install breathe; \

		pip install -r requirements.txt; \

		deactivate;\

	)

CRA Git | Maintained and supported by SUSTech CRA and CCSE