ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2068 from junghans/cmake_enable_chain.x

Browse Source 
cmake: enable Fortran before checking for the compiler
This commit is contained in:
Axel Kohlmeyer
2020-05-05 18:36:08 -04:00
committed by GitHub
parent 260e6bafd5 fc7b1dc4fd
commit 14fb49c1cb
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/CMakeLists.txt
View File

@ -553,11 +553,17 @@ if(BUILD_TOOLS)
install(TARGETS binary2txt DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS binary2txt DESTINATION ${CMAKE_INSTALL_BINDIR})
include(CheckGeneratorSupport) include(CheckGeneratorSupport)
if(CMAKE_GENERATOR_SUPPORT_FORTRAN AND CMAKE_Fortran_COMPILER) if(CMAKE_GENERATOR_SUPPORT_FORTRAN)
enable_language(Fortran) include(CheckLanguage)
add_executable(chain.x ${LAMMPS_TOOLS_DIR}/chain.f) check_language(Fortran)
target_link_libraries(chain.x PRIVATE ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}) if(CMAKE_Fortran_COMPILER)
install(TARGETS chain.x DESTINATION ${CMAKE_INSTALL_BINDIR}) enable_language(Fortran)
add_executable(chain.x ${LAMMPS_TOOLS_DIR}/chain.f)
target_link_libraries(chain.x PRIVATE ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
install(TARGETS chain.x DESTINATION ${CMAKE_INSTALL_BINDIR})
else()
message(WARNING "No suitable Fortran compiler found, skipping building 'chain.x'")
endif()
else() else()
message(WARNING "CMake build doesn't support fortran, skipping building 'chain.x'") message(WARNING "CMake build doesn't support fortran, skipping building 'chain.x'")
endif() endif()

3
cmake/Modules/FindTBB_MALLOC.cmake
View File

@ -11,7 +11,8 @@
# TBB Malloc # TBB Malloc
find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h PATHS $ENV{TBBROOT}/include) find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h PATHS $ENV{TBBROOT}/include)
find_library(TBB_MALLOC_LIBRARY NAMES tbbmalloc PATHS $ENV{TBBROOT}/lib/intel64/gcc4.7 find_library(TBB_MALLOC_LIBRARY NAMES tbbmalloc PATHS $ENV{TBBROOT}/lib/intel64/gcc4.8
$ENV{TBBROOT}/lib/intel64/gcc4.7
$ENV{TBBROOT}/lib/intel64/gcc4.4 $ENV{TBBROOT}/lib/intel64/gcc4.4
$ENV{TBBROOT}/lib/intel64/gcc4.1) $ENV{TBBROOT}/lib/intel64/gcc4.1)